github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 19:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-ping-refactor

Browse Source
This commit is contained in:
DuckVador 2020-07-10 18:33:05 +08:00
commit 05d3365295
18 changed files with 118 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@ -112,14 +112,13 @@ jobs:
- uses: actions/setup-node@v1
if: matrix.platform == 'macos-latest'
with:
node-version: '10.x'
node-version: '12.x'
- run: npm install -g appdmg
if: matrix.platform == 'macos-latest'
- name: macOS - ${{ matrix.qt_version }} - Generate Dependencies and Build
shell: bash
if: matrix.platform == 'macos-latest'
run: |
sudo xcode-select -s "/Applications/Xcode_10.3.app"
mkdir build
cd build
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DDS_STORE_SCRIPT=ON

2
3rdparty/SingleApplication vendored

@ -1 +1 @@
Subproject commit bae7c331ca7203a242e4533ba859c0c6016521ba
Subproject commit e93c12ab69a25fcaa963416f0e348d3269263190

2
3rdparty/zxing-cpp vendored

@ -1 +1 @@
Subproject commit 6d40262e7293666909f7325075d452637f2fca75
Subproject commit 50ecad2442d3ef1301516687d904c7309b922fe0

9
assets/qv2ray.desktop
View File

@ -16,7 +16,7 @@ Terminal=false
Icon=qv2ray
Exec=qv2ray %u
MimeType=x-scheme-handler/qv2ray;
Actions=debug;noPlugin;noScaleFactor;noAPI;
Actions=debug;noPlugin;noScaleFactor;noAPI;noAutoConnection;
[Desktop Action debug]
Name=Start with Debug Mode
@ -41,3 +41,10 @@ Name=Start without gRPC API
Name[zh_CN]=不使用 gRPC API 启动
Name[ja]=gRPC使用せずに起動
Exec=qv2ray --noAPI
[Desktop Action noAutoConnection]
Name=Start without automatic connection
Name[zh_CN]=不自动连接节点启动
Name[ja]=自動接続使用せずに起動
Exec=qv2ray --noAutoConnection

3
azure-pipelines.yml
View File

@ -19,7 +19,6 @@ steps:
inputs:
versionSpec: '12.x'
- script: |
sudo xcode-select -s /Applications/Xcode_10.3.app
brew install protobuf grpc ninja qt5 pkg-config
npm install -g appdmg
displayName: Prepare dependencies
@ -47,4 +46,4 @@ steps:
action: edit
tag: '$(Build.SourceBranchName)'
isPreRelease: true
addChangeLog: false
addChangeLog: false

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
qv2ray (2.6.0-1) unstable; urgency=medium
* New Release 2.6.0
-- Guobang Bi <ymshenyu@gmail.com> Thu, 09 Jul 2020 22:04:57 +0800
qv2ray (2.6.0~rc6-1) unstable; urgency=medium
* New Release 2.6.0-rc6

2
libs/puresource

@ -1 +1 @@
Subproject commit bd4f9335bb89e7b1199282c685d49dd5ae4ce1fa
Subproject commit 39d0644bd3d9348f8482d3f5375a9196a54a4348

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
5748
5761

2
makespec/VERSIONSUFFIX
View File

@ -1 +1 @@
-rc6

9
src/base/models/QvConfigIdentifier.hpp
View File

@ -195,15 +195,6 @@ namespace Qv2ray::base
{
return JsonStructHelper::___json_struct_store_data(entries);
}
auto toMap() const
{
std::map<StatisticsType, QvStatsData> result;
for (auto i = 0; i < entries.count(); i++)
{
result[StatisticsType(i)] = { entries[i].upLinkData, entries[i].downLinkData };
}
return result;
}
void loadJson(const QJsonValue &d)
{
entries.clear();

2
src/core/kernel/APIBackend.cpp
View File

@ -87,6 +87,7 @@ namespace Qv2ray::core::kernel
while (running)
{
QThread::msleep(1000);
if (!dialed)
{
#ifndef ANDROID
@ -125,7 +126,6 @@ namespace Qv2ray::core::kernel
apiFailCounter = hasError ? apiFailCounter + 1 : 0;
// Changed: Removed isrunning check here
emit onAPIDataReady(statsResult);
QThread::msleep(1000);
} // end while running
} // end while started

2
src/ui/widgets/ConnectionInfoWidget.cpp
View File

@ -100,7 +100,7 @@ void ConnectionInfoWidget::ShowDetails(const ConnectionGroupPair &_identifier)
QStringList shareLinks;
for (const auto &connection : ConnectionManager->Connections(groupId))
{
shareLinks << ConvertConfigToString({ connection, groupId }, false);
shareLinks << ConvertConfigToString({ connection, groupId }, !GlobalConfig.uiConfig.useOldShareLinkFormat);
}
//
auto complexCount = shareLinks.removeAll(QV2RAY_SERIALIZATION_COMPLEX_CONFIG_PLACEHOLDER);

8
src/ui/windows/w_PreferencesWindow.cpp
View File

@ -213,6 +213,11 @@ PreferencesWindow::PreferencesWindow(QWidget *parent) : QvDialog(parent), Curren
//
SET_AUTOSTART_UI_ENABLED(CurrentConfig.autoStartBehavior == AUTO_CONNECTION_FIXED);
//
if (CurrentConfig.autoStartId.isEmpty())
{
CurrentConfig.autoStartId.groupId = DefaultGroupId;
}
//
auto autoStartConnId = CurrentConfig.autoStartId.connectionId;
auto autoStartGroupId = CurrentConfig.autoStartId.groupId;
//
@ -698,7 +703,8 @@ void PreferencesWindow::on_setSysProxyCB_stateChanged(int arg1)
void PreferencesWindow::on_autoStartSubsCombo_currentIndexChanged(const QString &arg1)
{
LOADINGCHECK if (arg1.isEmpty())
LOADINGCHECK
if (arg1.isEmpty())
{
CurrentConfig.autoStartId.clear();
autoStartConnCombo->clear();

22
translations/en_US.ts
View File

@ -1120,10 +1120,6 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Encryption Method</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Level</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>OTA</source>
<translation type="unfinished"></translation>
@ -1160,6 +1156,10 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Tests</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Http</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PluginManageWindow</name>
@ -1882,6 +1882,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Only V2ray Core v4.21+ is supported.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
@ -2170,7 +2174,11 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid streamSettings protocol: </source>
<source>Invalid streamSettings protocol: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown state.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -2288,6 +2296,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Qv2ray - A cross-platform Qt frontend for V2ray.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do not automatically connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Qv2ray::components::QvUpdateChecker</name>

22
translations/es_ES.ts
View File

@ -1120,10 +1120,6 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Encryption Method</source>
<translation>Método de encriptación</translation>
</message>
<message>
<source>Level</source>
<translation>Nivel</translation>
</message>
<message>
<source>OTA</source>
<translation>OTA</translation>
@ -1160,6 +1156,10 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Tests</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Http</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PluginManageWindow</name>
@ -1882,6 +1882,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Only V2ray Core v4.21+ is supported.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
@ -2170,7 +2174,11 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<translation>vmess: // url no es válida</translation>
</message>
<message>
<source>Invalid streamSettings protocol: </source>
<source>Invalid streamSettings protocol: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown state.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -2288,6 +2296,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Qv2ray - A cross-platform Qt frontend for V2ray.</source>
<translation>Qv2ray: una interfaz Qt multiplataforma para V2ray.</translation>
</message>
<message>
<source>Do not automatically connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Qv2ray::components::QvUpdateChecker</name>

24
translations/ja_JP.ts
View File

@ -1119,10 +1119,6 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Encryption Method</source>
<translation>暗号化方法</translation>
</message>
<message>
<source>Level</source>
<translation>レベル</translation>
</message>
<message>
<source>OTA</source>
<translation>OTA</translation>
@ -1159,6 +1155,10 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Tests</source>
<translation>テスト</translation>
</message>
<message>
<source>Http</source>
<translation>HTTP</translation>
</message>
</context>
<context>
<name>PluginManageWindow</name>
@ -1897,6 +1897,10 @@ V2Ray coreのファイル名は通常&apos;v2ray&apos;または&apos;v2ray.exe&a
<source>Only V2ray Core v4.21+ is supported.</source>
<translation>V2ray Core v4.21以降のみ対応しています。</translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation>旧リンク形式</translation>
</message>
</context>
<context>
<name>QObject</name>
@ -2185,8 +2189,12 @@ V2Ray coreのファイル名は通常&apos;v2ray&apos;または&apos;v2ray.exe&a
<translation>vmess:// url が無効です</translation>
</message>
<message>
<source>Invalid streamSettings protocol: </source>
<translation>streamSettings プロトコルが無効です: </translation>
<source>Invalid streamSettings protocol: </source>
<translation>無効な streamSettings プロトコル: </translation>
</message>
<message>
<source>Unknown state.</source>
<translation>不明な状態。</translation>
</message>
</context>
<context>
@ -2303,6 +2311,10 @@ V2Ray coreのファイル名は通常&apos;v2ray&apos;または&apos;v2ray.exe&a
<source>Qv2ray - A cross-platform Qt frontend for V2ray.</source>
<translation>Qv2ray - V2Ray用のクロスプラットフォームQtフロントエンド。</translation>
</message>
<message>
<source>Do not automatically connect</source>
<translation>自動的に接続しない</translation>
</message>
</context>
<context>
<name>Qv2ray::components::QvUpdateChecker</name>

22
translations/ru_RU.ts
View File

@ -1127,10 +1127,6 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Encryption Method</source>
<translation>Метод шифрования</translation>
</message>
<message>
<source>Level</source>
<translation>Уровень</translation>
</message>
<message>
<source>OTA</source>
<translation>OTA</translation>
@ -1167,6 +1163,10 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Tests</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Http</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PluginManageWindow</name>
@ -1889,6 +1889,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Only V2ray Core v4.21+ is supported.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>
@ -2177,7 +2181,11 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Invalid streamSettings protocol: </source>
<source>Invalid streamSettings protocol: </source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown state.</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -2295,6 +2303,10 @@ If you insist to proceed, we&apos;re not providing with any support.</source>
<source>Qv2ray - A cross-platform Qt frontend for V2ray.</source>
<translation type="unfinished">Qv2ray - кросс-платформенный Qt фронтенд для V2ray.</translation>
</message>
<message>
<source>Do not automatically connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Qv2ray::components::QvUpdateChecker</name>

26
translations/zh_CN.ts
View File

@ -1119,10 +1119,6 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Encryption Method</source>
<translation>加密方法</translation>
</message>
<message>
<source>Level</source>
<translation>级别</translation>
</message>
<message>
<source>OTA</source>
<translation>OTA</translation>
@ -1159,6 +1155,10 @@ This entry is ignored by V2Ray core when using DoH servers.</source>
<source>Tests</source>
<translation>测试</translation>
</message>
<message>
<source>Http</source>
<translation>HTTP</translation>
</message>
</context>
<context>
<name>PluginManageWindow</name>
@ -1877,7 +1877,7 @@ V2Ray 核心的文件名通常为 &apos;v2ray&apos; 或者 &apos;v2ray.exe&apos;
</message>
<message>
<source>Outbound Statistics (V2ray Core v4.26+)</source>
<translation>分出站统计 (V2Ray v2.46+)</translation>
<translation>分出站统计 (V2Ray v4.26+)</translation>
</message>
<message>
<source>Currently:
@ -1897,6 +1897,10 @@ V2Ray 核心的文件名通常为 &apos;v2ray&apos; 或者 &apos;v2ray.exe&apos;
<source>Only V2ray Core v4.21+ is supported.</source>
<translation>仅支持 V2Ray v4.21+。</translation>
</message>
<message>
<source>Old Share Link Format</source>
<translation>旧 VMess 链接格式</translation>
</message>
</context>
<context>
<name>QObject</name>
@ -2185,8 +2189,12 @@ V2Ray 核心的文件名通常为 &apos;v2ray&apos; 或者 &apos;v2ray.exe&apos;
<translation>vmess:// 链接无效</translation>
</message>
<message>
<source>Invalid streamSettings protocol: </source>
<translation>无效的 streamSettings 协议: </translation>
<source>Invalid streamSettings protocol: </source>
<translation>无效的 streamSettings 协议: </translation>
</message>
<message>
<source>Unknown state.</source>
<translation>未知状态。</translation>
</message>
</context>
<context>
@ -2303,6 +2311,10 @@ V2Ray 核心的文件名通常为 &apos;v2ray&apos; 或者 &apos;v2ray.exe&apos;
<source>Qv2ray - A cross-platform Qt frontend for V2ray.</source>
<translation>Qv2ray - 一个 V2Ray 的跨平台 Qt 前端。</translation>
</message>
<message>
<source>Do not automatically connect</source>
<translation>不要自动连接节点</translation>
</message>
</context>
<context>
<name>Qv2ray::components::QvUpdateChecker</name>