From c7a6bca26fa2a8ac1384074b42426cd29d423482 Mon Sep 17 00:00:00 2001 From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com> Date: Sat, 29 Feb 2020 23:20:55 +0800 Subject: [PATCH] add: added ConnectionRename, GroupRename UI slot implementations --- makespec/BUILDVERSION | 2 +- src/core/handler/ConnectionHandler.cpp | 1 + src/ui/widgets/ConnectionInfoWidget.ui | 3 +++ src/ui/widgets/ConnectionItemWidget.cpp | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 5045e5c2..7223c3c3 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -4171 +4177 diff --git a/src/core/handler/ConnectionHandler.cpp b/src/core/handler/ConnectionHandler.cpp index b9e22857..c298a918 100644 --- a/src/core/handler/ConnectionHandler.cpp +++ b/src/core/handler/ConnectionHandler.cpp @@ -482,6 +482,7 @@ namespace Qv2ray::core::handlers { return tr("Group does not exist"); } + OnGroupRenamed(id, groups[id].displayName, newName); groups[id].displayName = newName; return {}; } diff --git a/src/ui/widgets/ConnectionInfoWidget.ui b/src/ui/widgets/ConnectionInfoWidget.ui index 80eef415..d2cfdc57 100644 --- a/src/ui/widgets/ConnectionInfoWidget.ui +++ b/src/ui/widgets/ConnectionInfoWidget.ui @@ -187,6 +187,9 @@ :/assets/icons/qv2ray.ico + + true + Qt::AlignCenter diff --git a/src/ui/widgets/ConnectionItemWidget.cpp b/src/ui/widgets/ConnectionItemWidget.cpp index f335988c..f54cc635 100644 --- a/src/ui/widgets/ConnectionItemWidget.cpp +++ b/src/ui/widgets/ConnectionItemWidget.cpp @@ -40,6 +40,12 @@ ConnectionItemWidget::ConnectionItemWidget(const ConnectionId &id, QWidget *pare { emit RequestWidgetFocus(this); } + connect(ConnectionManager, &QvConnectionHandler::OnConnectionRenamed, [&](const ConnectionId &id, const QString &, const QString &newName) { + if (id == connectionId) + { + connNameLabel->setText(newName); + } + }); } // ======================================= Initialisation for root nodes. @@ -61,6 +67,13 @@ ConnectionItemWidget::ConnectionItemWidget(const GroupId &id, QWidget *parent) : connect(ConnectionManager, &QvConnectionHandler::OnConnectionChanged, this, &ConnectionItemWidget::RecalculateConnectionsCount); connect(ConnectionManager, &QvConnectionHandler::OnConnectionGroupChanged, this, &ConnectionItemWidget::RecalculateConnectionsCount); connect(ConnectionManager, &QvConnectionHandler::OnSubscriptionUpdateFinished, this, &ConnectionItemWidget::RecalculateConnectionsCount); + // + connect(ConnectionManager, &QvConnectionHandler::OnGroupRenamed, [&](const GroupId &id, const QString &, const QString &newName) { + if (id == groupId) + { + connNameLabel->setText(newName); + } + }); } void ConnectionItemWidget::BeginConnection()