Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 12:34:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

3.1

Browse Source
This commit is contained in:
arm64v8a
2023-05-17 16:38:18 +09:00
parent e5eaa5c674
commit 158dfed3f3
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/ConfigBuilder.cpp
View File

@@ -732,7 +732,7 @@ namespace NekoRay {
inboundObj["stack"] = Preset::SingBox::VpnImplementation.value(dataStore->vpn_implementation); inboundObj["stack"] = Preset::SingBox::VpnImplementation.value(dataStore->vpn_implementation);
inboundObj["strict_route"] = dataStore->vpn_strict_route; inboundObj["strict_route"] = dataStore->vpn_strict_route;
inboundObj["inet4_address"] = "172.19.0.1/28"; inboundObj["inet4_address"] = "172.19.0.1/28";
if (dataStore->vpn_ipv6) inboundObj["inet4_address"] = "fdfe:dcba:9876::1/126"; if (dataStore->vpn_ipv6) inboundObj["inet6_address"] = "fdfe:dcba:9876::1/126";
if (dataStore->routing->sniffing_mode != SniffingMode::DISABLE) { if (dataStore->routing->sniffing_mode != SniffingMode::DISABLE) {
inboundObj["sniff"] = true; inboundObj["sniff"] = true;
inboundObj["sniff_override_destination"] = dataStore->routing->sniffing_mode == SniffingMode::FOR_DESTINATION; inboundObj["sniff_override_destination"] = dataStore->routing->sniffing_mode == SniffingMode::FOR_DESTINATION;

2
nekoray_version.txt
View File

@@ -1 +1 @@
3.0-2023-05-14 3.1-2023-05-17

4
translations/fa_IR.ts
View File

@@ -678,10 +678,6 @@ These settings can be changed later.</source>
<source>VPN Settings</source> <source>VPN Settings</source>
<translation>تنظیمات vpn</translation> <translation>تنظیمات vpn</translation>
</message> </message>
<message>
<source>VPN Implementation</source>
<translation>پیاده سازی VPN</translation>
</message>
<message> <message>
<source>Hide Console</source> <source>Hide Console</source>
<translation>مخفی کردن کنسول</translation> <translation>مخفی کردن کنسول</translation>

4
translations/zh_CN.ts
View File

@@ -676,10 +676,6 @@ These settings can be changed later.</source>
<source>VPN Settings</source> <source>VPN Settings</source>
<translation>VPN 设置</translation> <translation>VPN 设置</translation>
</message> </message>
<message>
<source>VPN Implementation</source>
<translation>VPN 实现</translation>
</message>
<message> <message>
<source>Hide Console</source> <source>Hide Console</source>
<translation>隐藏控制台</translation> <translation>隐藏控制台</translation>

2
ui/dialog_vpn_settings.ui
View File

@@ -32,7 +32,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>VPN Implementation</string> <string notr="true">Stack</string>
</property> </property>
</widget> </widget>
</item> </item>

6
ui/mainwindow.cpp
View File

@@ -45,6 +45,7 @@
#include <QMessageBox> #include <QMessageBox>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QElapsedTimer>
QElapsedTimer coreRestartTimer; QElapsedTimer coreRestartTimer;
@@ -671,7 +672,10 @@ void MainWindow::on_menu_exit_triggered() {
QDir::setCurrent(QApplication::applicationDirPath()); QDir::setCurrent(QApplication::applicationDirPath());
auto arguments = NekoRay::dataStore->argv; auto arguments = NekoRay::dataStore->argv;
if (arguments.length() > 0) arguments.removeFirst(); if (arguments.length() > 0) {
arguments.removeFirst();
arguments.removeAll("-tray");
}
auto isLauncher = qEnvironmentVariable("NKR_FROM_LAUNCHER") == "1"; auto isLauncher = qEnvironmentVariable("NKR_FROM_LAUNCHER") == "1";
if (isLauncher) arguments.prepend("--"); if (isLauncher) arguments.prepend("--");
auto program = isLauncher ? "./launcher" : QApplication::applicationFilePath(); auto program = isLauncher ? "./launcher" : QApplication::applicationFilePath();

5
ui/mainwindow_grpc.cpp
View File

@@ -256,7 +256,10 @@ void MainWindow::neko_start(int _id) {
return true; return true;
}; };
if (!mu_starting.tryLock()) return; if (!mu_starting.tryLock()) {
MessageBoxWarning(software_name, "Another profile is starting...");
return;
}
// timeout message // timeout message
auto restartMsgbox = new QMessageBox(QMessageBox::Question, software_name, tr("If there is no response for a long time, it is recommended to restart the software."), auto restartMsgbox = new QMessageBox(QMessageBox::Question, software_name, tr("If there is no response for a long time, it is recommended to restart the software."),