From 7f99cf8b1696aaffe11f0853e69842396db0cca0 Mon Sep 17 00:00:00 2001
From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com>
Date: Mon, 20 Apr 2020 12:43:21 +0800
Subject: [PATCH] fix: some minor UI updates
---
src/ui/w_PreferencesWindow.cpp | 6 +
src/ui/w_PreferencesWindow.hpp | 2 +
src/ui/w_PreferencesWindow.ui | 202 ++++++++++++++++++---------------
3 files changed, 117 insertions(+), 93 deletions(-)
diff --git a/src/ui/w_PreferencesWindow.cpp b/src/ui/w_PreferencesWindow.cpp
index 6cf8d5dc..4ff55bbb 100644
--- a/src/ui/w_PreferencesWindow.cpp
+++ b/src/ui/w_PreferencesWindow.cpp
@@ -1244,3 +1244,9 @@ void PreferencesWindow::on_tproxyMode_currentTextChanged(const QString &arg1)
NEEDRESTART
CurrentConfig.inboundConfig.tproxy_mode = arg1;
}
+
+void PreferencesWindow::on_tproxyListenAddr_textEdited(const QString &arg1)
+{
+ NEEDRESTART
+ CurrentConfig.inboundConfig.tproxy_ip = arg1;
+}
diff --git a/src/ui/w_PreferencesWindow.hpp b/src/ui/w_PreferencesWindow.hpp
index 1b2b48f8..76c4f8ff 100644
--- a/src/ui/w_PreferencesWindow.hpp
+++ b/src/ui/w_PreferencesWindow.hpp
@@ -190,6 +190,8 @@ class PreferencesWindow
void on_tproxyMode_currentTextChanged(const QString &arg1);
+ void on_tproxyListenAddr_textEdited(const QString &arg1);
+
private:
//
RouteSettingsMatrixWidget *routeSettingsWidget;
diff --git a/src/ui/w_PreferencesWindow.ui b/src/ui/w_PreferencesWindow.ui
index 96c40f33..68428b0f 100644
--- a/src/ui/w_PreferencesWindow.ui
+++ b/src/ui/w_PreferencesWindow.ui
@@ -20,6 +20,16 @@
true
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
-
@@ -674,8 +684,8 @@ Custom DNS Settings
0
0
- 808
- 473
+ 794
+ 484
@@ -895,78 +905,116 @@ Custom DNS Settings
-
-
- -
-
-
- Transparent Proxy Settings
-
-
- true
-
-
- false
-
-
-
-
-
-
-
+
-
+
+
+ Transparent Proxy Settings
+
+
+ true
+
+
+ false
+
+
+
-
Listening Address
- -
-
-
- 127.0.0.1
-
-
+
-
+
+
-
+
+
+ 127.0.0.1
+
+
+
+ -
+
+
+ Port
+
+
+
+ -
+
+
+ 1
+
+
+ 65535
+
+
+ 12345
+
+
+
+
- -
-
+
-
+
- Port
+ Network Options
- -
-
-
- 1
-
-
- 65535
-
-
- 12345
-
-
+
-
+
+
-
+
+
+ TCP
+
+
+
+ -
+
+
+ UDP
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ -
+
+
+ Follow Redirect
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
- -
-
+
-
+
- TCP
+ Mode
- -
-
-
- UDP
-
-
-
- -
-
-
- Follow Redirect
-
-
-
- -
+
-
@@ -986,23 +1034,10 @@ Custom DNS Settings
- -
-
-
-
- 0
- 0
-
-
-
- Mode
-
-
-
-
-
-
+
+
+
-
@@ -1893,9 +1928,6 @@ Custom DNS Settings
true
-
-
-
@@ -1920,16 +1952,6 @@ Custom DNS Settings
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
@@ -1957,12 +1979,6 @@ Custom DNS Settings
httpAuthCB
httpAuthUsernameTxt
httpAuthPasswordTxt
- tproxGroupBox
- tproxyListenAddr
- tProxyPort
- tproxyEnableTCP
- tproxyEnableUDP
- tproxyFollowRedirect
proxyDefaultCb
bypassCNCb
localDNSCb