mirror of
https://github.com/Qv2ray/Qv2ray.git
synced 2025-05-20 10:50:23 +08:00
Merge branch 'dev' into dev-ping-refactor
This commit is contained in:
DuckVador
GitHub
commit
21a03aab8d
@ -113,6 +113,7 @@ set(QV2RAY_DISABLE_AUTO_UPDATE OFF CACHE BOOL "Disable update checker")
|
||||
set(BUILD_TESTING OFF CACHE BOOL "Build test")
|
||||
set(EMBED_TRANSLATIONS OFF CACHE BOOL "Embed translations")
|
||||
set(QV2RAY_AUTO_DEPLOY ON CACHE BOOL "Automatically run deploy command after build")
|
||||
set(QV2RAY_HAS_BUILT_IN_THEMES ON CACHE BOOL "Build with built-in themes")
|
||||
|
||||
if(QV2RAY_DEFAULT_VASSETS_PATH AND NOT QV2RAY_DEFAULT_VASSETS_PATH STREQUAL "unset")
|
||||
add_definitions(-DQV2RAY_DEFAULT_VASSETS_PATH="${QV2RAY_DEFAULT_VASSETS_PATH}")
|
||||
@ -197,7 +198,10 @@ include(src/plugin-interface/QvPluginInterface.cmake)
|
||||
# ==================================================================================
|
||||
include(cmake/components/qv2ray-lib.cmake)
|
||||
include(cmake/components/qv2ray-ui.cmake)
|
||||
include(libs/uistyles/uistyles.cmake)
|
||||
|
||||
if (QV2RAY_HAS_BUILT_IN_THEMES)
|
||||
include(libs/uistyles/uistyles.cmake)
|
||||
endif()
|
||||
|
||||
set(QRC_RESOURCES
|
||||
${UISTYLE_QRCS}
|
||||
@ -345,7 +349,7 @@ if(UNIX AND NOT APPLE AND NOT WIN32)
|
||||
install(TARGETS qv2ray RUNTIME DESTINATION bin)
|
||||
install(FILES assets/qv2ray.metainfo.xml DESTINATION share/metainfo)
|
||||
install(FILES assets/qv2ray.desktop DESTINATION share/applications)
|
||||
install(FILES assets/icons/qv2ray.png DESTINATION share/icons/hicolor/256x256/apps)
|
||||
install(FILES assets/icons/qv2ray.png DESTINATION share/icons/hicolor/1024x1024/apps)
|
||||
if(NOT EMBED_TRANSLATIONS)
|
||||
install(FILES ${QM_FILES} DESTINATION share/qv2ray/lang)
|
||||
endif()
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
# Qv2ray - Make V2ray real cross-platform
|
||||
# Qv2ray - Make V2Ray real cross-platform
|
||||
|
||||
[](http://hits.dwyl.io/Qv2ray/Qv2ray)
|
||||
[](https://github.com/Qv2ray/Qv2ray/releases)
|
||||
[](https://github.com/Qv2ray/Qv2ray/releases)
|
||||
|
||||
使用 Qt 框架的跨平台 v2ray 客户端。支持 Windows, Linux, macOS。
|
||||
使用 Qt 框架的跨平台 V2Ray 客户端。支持 Windows, Linux, macOS。
|
||||
|
||||
## Availability & Status
|
||||
|
||||
@ -110,7 +110,7 @@
|
||||
Qv2ray is licenced under [](https://www.gnu.org/licenses/gpl-3.0)
|
||||
|
||||
```
|
||||
Qv2ray, A Qt frontend for v2ray. Written in C++
|
||||
Qv2ray, A Qt frontend for V2Ray. Written in C++
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
||||
9
debian/changelog
vendored
9
debian/changelog
vendored
@ -1,3 +1,12 @@
|
||||
qv2ray (2.6.1-1) unstable; urgency=medium
|
||||
|
||||
* fix: should not edit GroupManager tablewidget
|
||||
* fix: fixed connection import/export with unwanted content (Closes #771)
|
||||
* fix: fixed V2RAY_LOCATION_ASSET env name (Closes #768)
|
||||
* fix: QR code file cannot be imported
|
||||
|
||||
-- Guobang Bi <ymshenyu@gmail.com> Mon, 13 Jul 2020 09:37:27 +0800
|
||||
|
||||
qv2ray (2.6.0-1) unstable; urgency=medium
|
||||
|
||||
* New Release 2.6.0
|
||||
|
||||
@ -1 +1 @@
|
||||
5767
|
||||
5779
|
||||
@ -32,7 +32,7 @@ namespace Qv2ray::components::proxy
|
||||
// * means disabled.
|
||||
if (!lines[i].contains("*"))
|
||||
{
|
||||
result << (lines[i].contains(" ") ? "\"" + lines[i] + "\"" : lines[i]);
|
||||
result << lines[i];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -75,8 +75,8 @@ namespace Qv2ray::core::handler
|
||||
tcpingHelper = new LatencyTestHost(5, this);
|
||||
connect(tcpingHelper, &LatencyTestHost::OnLatencyTestCompleted, this, &QvConfigHandler::OnLatencyDataArrived_p);
|
||||
//
|
||||
// Save per 1 minutes.
|
||||
saveTimerId = startTimer(1 * 60 * 1000);
|
||||
// Save per 1 hour.
|
||||
saveTimerId = startTimer(1 * 60 * 60 * 1000);
|
||||
// Do not ping all...
|
||||
pingConnectionTimerId = startTimer(60 * 1000);
|
||||
}
|
||||
@ -617,7 +617,8 @@ namespace Qv2ray::core::handler
|
||||
filteredConnections.count() > 5 ||
|
||||
QvMessageBoxAsk(nullptr, tr("Update Subscription"),
|
||||
tr("%1 out of %n entrie(s) have been filtered out, do you want to continue?", "", _newConnections.count())
|
||||
.arg(filteredConnections.count())) == QMessageBox::Yes;
|
||||
.arg(filteredConnections.count()) +
|
||||
NEWLINE + GetDisplayName(id)) == QMessageBox::Yes;
|
||||
|
||||
for (const auto &config : useFilteredConnections ? filteredConnections : _newConnections)
|
||||
{
|
||||
@ -667,7 +668,7 @@ namespace Qv2ray::core::handler
|
||||
tr("Update Subscription"),
|
||||
tr("There're %n connection(s) in the group that do not belong the current subscription (any more).", "",
|
||||
originalConnectionIdList.count()) +
|
||||
NEWLINE + tr("Would you like to remove them?")) == QMessageBox::Yes;
|
||||
NEWLINE + GetDisplayName(id) + NEWLINE + tr("Would you like to remove them?")) == QMessageBox::Yes;
|
||||
if (needContinue)
|
||||
{
|
||||
LOG(MODULE_CORE_HANDLER, "Removed old connections not have been matched.")
|
||||
|
||||
@ -1106,8 +1106,14 @@ void PreferencesWindow::on_pushButton_clicked()
|
||||
{
|
||||
const auto ntpTitle = tr("NTP Checker");
|
||||
const auto ntpHint = tr("Check date and time from server:");
|
||||
const static QStringList ntpServerList = { "cn.pool.ntp.org", //
|
||||
"cn.ntp.org.cn", //
|
||||
"edu.ntp.org.cn", //
|
||||
"time.pool.aliyun.com", //
|
||||
"time1.cloud.tencent.com", //
|
||||
"ntp.neu.edu.cn" };
|
||||
bool ok = false;
|
||||
QString ntpServer = QInputDialog::getText(this, ntpTitle, ntpHint, QLineEdit::Normal, "202.118.1.46", &ok).trimmed();
|
||||
QString ntpServer = QInputDialog::getItem(this, ntpTitle, ntpHint, ntpServerList, 0, true, &ok).trimmed();
|
||||
if (!ok)
|
||||
return;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user