diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 9e10b4b6..31bd1cc7 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -4390 +4395 diff --git a/src/core/handler/ConnectionHandler.cpp b/src/core/handler/ConnectionHandler.cpp index 3f60be91..dc8bd703 100644 --- a/src/core/handler/ConnectionHandler.cpp +++ b/src/core/handler/ConnectionHandler.cpp @@ -389,6 +389,10 @@ namespace Qv2ray::core::handlers } CONFIGROOT root = GetConnectionRoot(connections[id].groupId, id); + if (IsComplexConfig(root)) + { + return tr("Complex config"); + } QStringList protocols; QStringList streamProtocols; auto outbound = root["outbounds"].toArray().first().toObject(); @@ -648,10 +652,10 @@ namespace Qv2ray::core::handlers LOG(MODULE_CORE_HANDLER, "Removing: " + conn.toString()) DeleteConnection(conn); } - + // Update the time groups[id].lastUpdated = system_clock::to_time_t(system_clock::now()); - + return hasErrorOccured; } diff --git a/src/ui/w_MainWindow.ui b/src/ui/w_MainWindow.ui index 2596a71a..f52ba91b 100644 --- a/src/ui/w_MainWindow.ui +++ b/src/ui/w_MainWindow.ui @@ -242,7 +242,7 @@ 0 0 480 - 768 + 551 @@ -285,18 +285,6 @@ - - - - - 13 - - - - Speed Graph - - - @@ -305,39 +293,104 @@ - - - - 0 - 200 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - + 13 - - Log + + 1 + + + + 0 + -9 + 450 + 218 + + + + Speed Graph + + + + + + + 0 + 200 + + + + + 10 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + + + + + 0 + -45 + 450 + 254 + + + + Log + + + + + + + 0 + 200 + + + + + 9 + + + + QTextEdit::NoWrap + + + + + + + + 10 + + + + Clear Log + + + + + @@ -347,31 +400,6 @@ - - - - - 0 - 200 - - - - - 9 - - - - QTextEdit::NoWrap - - - - - - - Clear Log - - -