From f18d1c97e9deef1d3a504f87755247912e7df601 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Mon, 22 May 2023 12:32:37 +0900
Subject: [PATCH] minor ui improvement
---
db/ConfigBuilder.cpp | 2 +-
fmt/Bean2CoreObj_box.cpp | 2 +-
translations/fa_IR.ts | 12 ++++++++
translations/zh_CN.ts | 12 ++++++++
ui/dialog_basic_settings.cpp | 4 +--
ui/dialog_vpn_settings.ui | 16 +++++------
ui/edit/dialog_edit_profile.ui | 52 +++++++++++++++++++---------------
ui/edit/edit_shadowsocks.ui | 8 ++----
ui/mainwindow.cpp | 1 +
9 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
index be9d7bb..cec12f9 100644
--- a/db/ConfigBuilder.cpp
+++ b/db/ConfigBuilder.cpp
@@ -602,7 +602,7 @@ namespace NekoGui {
// mux common
auto needMux = ent->type == "vmess" || ent->type == "trojan" || ent->type == "vless" || ent->type == "shadowsocks";
- needMux &= !dataStore->mux_protocol.isEmpty() && dataStore->mux_concurrency > 0;
+ needMux &= dataStore->mux_concurrency > 0;
if (stream != nullptr) {
if (IS_NEKO_BOX) {
diff --git a/fmt/Bean2CoreObj_box.cpp b/fmt/Bean2CoreObj_box.cpp
index 73a29d0..021fa43 100644
--- a/fmt/Bean2CoreObj_box.cpp
+++ b/fmt/Bean2CoreObj_box.cpp
@@ -63,7 +63,7 @@ namespace NekoGui_fmt {
tls["reality"] = QJsonObject{
{"enabled", true},
{"public_key", reality_pbk},
- {"short_id", reality_sid},
+ {"short_id", reality_sid.split(",")[0]},
};
}
outbound->insert("tls", tls);
diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts
index bf59b53..054d80d 100644
--- a/translations/fa_IR.ts
+++ b/translations/fa_IR.ts
@@ -433,6 +433,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
Confirm
+
+ Server support is required
+
+
+
+ Reality short id. Accept only one value.
+
+
DialogFirstSetup
@@ -889,6 +897,10 @@ This needs to be run NekoBox with administrator privileges.
Plugin
پلاگین
+
+ Server support is required
+
+
EditSocksHttp
diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
index 21ad5c6..8063456 100644
--- a/translations/zh_CN.ts
+++ b/translations/zh_CN.ts
@@ -433,6 +433,14 @@ For NekoBox, this rewrites the underlying(localhost) DNS in VPN mode, normal mod
Confirm
确认
+
+ Server support is required
+ 需要服务器支持
+
+
+ Reality short id. Accept only one value.
+ Reality short id. 只接受一个值。
+
DialogFirstSetup
@@ -891,6 +899,10 @@ This needs to be run NekoBox with administrator privileges.
Plugin
插件
+
+ Server support is required
+ 需要服务器支持
+
EditSocksHttp
diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp
index 79e1a8f..8dc3da5 100644
--- a/ui/dialog_basic_settings.cpp
+++ b/ui/dialog_basic_settings.cpp
@@ -62,10 +62,10 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
ui->groupBox_http->hide();
ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed (SOCKS+HTTP)"));
ui->log_level->addItems(QString("trace debug info warn error fatal panic").split(" "));
- ui->mux_protocol->addItems({"", "h2mux", "smux", "yamux"});
+ ui->mux_protocol->addItems({"h2mux", "smux", "yamux"});
} else {
ui->log_level->addItems({"debug", "info", "warning", "none"});
- ui->mux_protocol->addItems({"", "mux.cool"});
+ ui->mux_protocol->hide();
}
refresh_auth();
diff --git a/ui/dialog_vpn_settings.ui b/ui/dialog_vpn_settings.ui
index 6558e1b..3959bb6 100644
--- a/ui/dialog_vpn_settings.ui
+++ b/ui/dialog_vpn_settings.ui
@@ -114,13 +114,6 @@
- -
-
-
- Hide Console
-
-
-
-
@@ -132,6 +125,13 @@ This needs to be run NekoBox with administrator privileges.
+ -
+
+
+ Hide Console
+
+
+
@@ -212,8 +212,8 @@ This needs to be run NekoBox with administrator privileges.
vpn_ipv6
strict_route
fake_dns
- hide_console
single_core
+ hide_console
vpn_rule_cidr
vpn_rule_process
whitelist_mode
diff --git a/ui/edit/dialog_edit_profile.ui b/ui/edit/dialog_edit_profile.ui
index 78de5ec..a29480d 100644
--- a/ui/edit/dialog_edit_profile.ui
+++ b/ui/edit/dialog_edit_profile.ui
@@ -160,29 +160,29 @@
-
-
-
-
- Apply settings to this group
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
+
+
+ Apply settings to this group
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+
@@ -327,6 +327,9 @@
-
+
+ Server support is required
+
Multiplex
@@ -572,6 +575,9 @@ security (QUIC)
-
+
+ Reality short id. Accept only one value.
+
Reality Sid
diff --git a/ui/edit/edit_shadowsocks.ui b/ui/edit/edit_shadowsocks.ui
index 92ccfb2..5342d79 100644
--- a/ui/edit/edit_shadowsocks.ui
+++ b/ui/edit/edit_shadowsocks.ui
@@ -162,15 +162,13 @@
v2ray-plugin
- -
-
- ssr
-
-
-
+
+ Server support is required
+
UDP over TCP
diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
index b306fa1..a3d39f4 100644
--- a/ui/mainwindow.cpp
+++ b/ui/mainwindow.cpp
@@ -97,6 +97,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
if (NekoGui::dataStore->log_level == "warning") NekoGui::dataStore->log_level = "info";
if (!Preset::SingBox::DomainStrategy.contains(NekoGui::dataStore->routing->domain_strategy)) NekoGui::dataStore->routing->domain_strategy = "";
if (!Preset::SingBox::DomainStrategy.contains(NekoGui::dataStore->routing->outbound_domain_strategy)) NekoGui::dataStore->routing->outbound_domain_strategy = "";
+ if (NekoGui::dataStore->mux_protocol.isEmpty()) NekoGui::dataStore->mux_protocol = "h2mux";
//
if (QDir("dashboard").count() == 0) {
QDir().mkdir("dashboard");