From 2e9c237367e7239f24eb592cdba3e6d4f1654b7a Mon Sep 17 00:00:00 2001
From: huangyuhui <huanghongxun2008@126.com>
Date: Fri, 17 Aug 2018 23:48:01 +0800
Subject: [PATCH] Use system proxy by default

---
 HMCL/src/main/java/org/jackhuang/hmcl/Main.java           | 2 ++
 .../src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java | 8 +++++---
 HMCL/src/main/resources/assets/fxml/setting.fxml          | 2 +-
 HMCL/src/main/resources/assets/lang/I18N.properties       | 2 +-
 HMCL/src/main/resources/assets/lang/I18N_zh.properties    | 2 +-
 HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
index 8196d5535..8ec04eb0a 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/Main.java
@@ -40,6 +40,8 @@ import org.jackhuang.hmcl.upgrade.UpdateHandler;
 public final class Main {
 
     public static void main(String[] args) {
+        System.setProperty("java.net.useSystemProxies", "true");
+
         checkJavaFX();
         checkDirectoryPath();
         checkDSTRootCAX3();
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
index dd61d13a4..279a1f900 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java
@@ -103,7 +103,7 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
     @FXML
     private StackPane themeColorPickerContainer;
     @FXML
-    private JFXCheckBox chkEnableProxy;
+    private JFXCheckBox chkDisableProxy;
     @FXML
     private JFXRadioButton chkProxyHttp;
     @FXML
@@ -160,10 +160,12 @@ public final class SettingsPage extends StackPane implements DecoratorPage {
         txtProxyUsername.textProperty().bindBidirectional(config().proxyUserProperty());
         txtProxyPassword.textProperty().bindBidirectional(config().proxyPassProperty());
 
-        proxyPane.disableProperty().bind(chkEnableProxy.selectedProperty().not());
+        proxyPane.disableProperty().bind(chkDisableProxy.selectedProperty());
         authPane.disableProperty().bind(chkProxyAuthentication.selectedProperty().not());
 
-        chkEnableProxy.selectedProperty().bindBidirectional(config().hasProxyProperty());
+        chkDisableProxy.setSelected(!config().hasProxy());
+        chkDisableProxy.selectedProperty().addListener(o -> config().setHasProxy(!chkDisableProxy.isSelected()));
+        config().hasProxyProperty().addListener(o -> chkDisableProxy.setSelected(!config().hasProxy()));
         chkProxyAuthentication.selectedProperty().bindBidirectional(config().hasProxyAuthProperty());
 
         selectedProxyType = new SimpleObjectProperty<Proxy.Type>(Proxy.Type.HTTP) {
diff --git a/HMCL/src/main/resources/assets/fxml/setting.fxml b/HMCL/src/main/resources/assets/fxml/setting.fxml
index 19cf76d20..b0c0f1b2e 100644
--- a/HMCL/src/main/resources/assets/fxml/setting.fxml
+++ b/HMCL/src/main/resources/assets/fxml/setting.fxml
@@ -63,7 +63,7 @@
 
                 <ComponentList title="%settings.launcher.proxy"> <!-- proxy -->
                     <VBox spacing="10">
-                        <JFXCheckBox fx:id="chkEnableProxy" text="%settings.launcher.proxy.enable" />
+                        <JFXCheckBox fx:id="chkDisableProxy" text="%settings.launcher.proxy.disable" />
                         <VBox fx:id="proxyPane" style="-fx-padding: 0 0 0 30;">
                             <HBox>
                                 <JFXRadioButton fx:id="chkProxyHttp" text="%settings.launcher.proxy.http" />
diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties
index 394778f5a..94ec5e947 100644
--- a/HMCL/src/main/resources/assets/lang/I18N.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N.properties
@@ -293,7 +293,7 @@ settings.launcher.language=Language
 settings.launcher.log_font=Log Font
 settings.launcher.proxy=Proxy
 settings.launcher.proxy.authentication=Proxy Authentication
-settings.launcher.proxy.enable=Enable Proxy
+settings.launcher.proxy.disable=Use system proxies
 settings.launcher.proxy.host=Host
 settings.launcher.proxy.http=HTTP
 settings.launcher.proxy.password=Password
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
index 12a38b6df..e8f8920d0 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties
@@ -293,7 +293,7 @@ settings.launcher.language=語言
 settings.launcher.log_font=日誌字體
 settings.launcher.proxy=代理
 settings.launcher.proxy.authentication=身份驗證
-settings.launcher.proxy.enable=启用代理
+settings.launcher.proxy.disable=使用系統代理
 settings.launcher.proxy.host=主機
 settings.launcher.proxy.http=HTTP
 settings.launcher.proxy.password=密碼
diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
index cf1ac1e00..93189b0f3 100644
--- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
+++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties
@@ -293,7 +293,7 @@ settings.launcher.language=语言
 settings.launcher.log_font=日志字体
 settings.launcher.proxy=代理
 settings.launcher.proxy.authentication=身份验证
-settings.launcher.proxy.enable=启用代理
+settings.launcher.proxy.disable=使用系统代理
 settings.launcher.proxy.host=主机
 settings.launcher.proxy.http=HTTP
 settings.launcher.proxy.password=密码