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

fix

Browse Source
This commit is contained in:
arm64v8a
2023-01-29 12:30:28 +09:00
parent 2482a5b48f
commit a42acc82b9
5 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -8,6 +8,10 @@ Support Windows / Linux / macOS amd64 out of the box now.
目前支持 Windows / Linux / macOS amd64 开箱即用 目前支持 Windows / Linux / macOS amd64 开箱即用
## Readme Translations
中文 / English (undone) / [fa_IR](README_fa.md)
## 下载 / Download ## 下载 / Download
### GitHub Releases (Portable ZIP) ### GitHub Releases (Portable ZIP)

22
db/ConfigBuilder.cpp
View File

@@ -332,11 +332,11 @@ namespace NekoRay {
} }
// def_outbound // def_outbound
status->routingRules += QJsonObject{ if (!status->forTest) status->routingRules += QJsonObject{
{"type", "field"}, {"type", "field"},
{"port", "0-65535"}, {"port", "0-65535"},
{"outboundTag", dataStore->routing->def_outbound}, {"outboundTag", dataStore->routing->def_outbound},
}; };
// final add routing rule // final add routing rule
auto routingRules = QString2QJsonObject(dataStore->routing->custom)["rules"].toArray(); auto routingRules = QString2QJsonObject(dataStore->routing->custom)["rules"].toArray();
@@ -813,10 +813,10 @@ namespace NekoRay {
add_rule_route(status->domainListDirect, false, "bypass"); add_rule_route(status->domainListDirect, false, "bypass");
// def_outbound // def_outbound
status->routingRules += QJsonObject{ if (!status->forTest) status->routingRules += QJsonObject{
{"port_range", ":"}, {"port_range", ":"},
{"outbound", dataStore->routing->def_outbound}, {"outbound", dataStore->routing->def_outbound},
}; };
// geopath // geopath
auto geoip = FindCoreAsset("geoip.db"); auto geoip = FindCoreAsset("geoip.db");
@@ -865,8 +865,8 @@ namespace NekoRay {
} }
QString WriteVPNSingBoxConfig() { QString WriteVPNSingBoxConfig() {
auto match_out = NekoRay::dataStore->vpn_rule_white ? "proxy" : "direct"; auto match_out = NekoRay::dataStore->vpn_rule_white ? "nekoray-socks" : "direct";
auto no_match_out = NekoRay::dataStore->vpn_rule_white ? "direct" : "proxy"; auto no_match_out = NekoRay::dataStore->vpn_rule_white ? "direct" : "nekoray-socks";
// user rule // user rule
QString process_name_rule = dataStore->vpn_rule_process.trimmed(); QString process_name_rule = dataStore->vpn_rule_process.trimmed();
if (!process_name_rule.isEmpty()) { if (!process_name_rule.isEmpty()) {

2
translations/fa_IR.ts
View File

@@ -101,7 +101,7 @@
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<translation>زبان</translation> <translation type="vanished">زبان</translation>
</message> </message>
<message> <message>
<source>Security</source> <source>Security</source>

2
translations/zh_CN.ts
View File

@@ -101,7 +101,7 @@
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
<translation>语言</translation> <translation type="vanished">语言</translation>
</message> </message>
<message> <message>
<source>Security</source> <source>Security</source>

49
ui/dialog_basic_settings.ui
View File

@@ -353,7 +353,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>Language</string> <string notr="true">Language</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -361,7 +361,7 @@
<widget class="QComboBox" name="language"> <widget class="QComboBox" name="language">
<item> <item>
<property name="text"> <property name="text">
<string>System</string> <string notr="true">System</string>
</property> </property>
</item> </item>
<item> <item>
@@ -443,20 +443,37 @@
</layout> </layout>
</item> </item>
<item row="5" column="0"> <item row="5" column="0">
<widget class="QGroupBox" name="groupBox_2"> <layout class="QHBoxLayout" name="horizontalLayout_24" stretch="1,1">
<layout class="QHBoxLayout" name="horizontalLayout_23"> <item>
<item> <widget class="QGroupBox" name="groupBox_2">
<widget class="QLabel" name="label_17"> <layout class="QHBoxLayout" name="horizontalLayout_23">
<property name="text"> <item>
<string>Max log lines</string> <widget class="QLabel" name="label_17">
</property> <property name="text">
</widget> <string>Max log lines</string>
</item> </property>
<item> </widget>
<widget class="QLineEdit" name="max_log_line"/> </item>
</item> <item>
</layout> <widget class="QLineEdit" name="max_log_line"/>
</widget> </item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>