[PR #163] [MERGED] feature/confirm-on-clear-and-delete-server #1628

Closed
opened 2026-10-13 20:46:08 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/163
Author: @Nethius
Created: 1/29/2023
Status: ✅ Merged
Merged: 1/30/2023
Merged by: @pokamest

Base: dev ← Head: feature/confirm-on-clear-and-delete-server


📝 Commits (5)

  • ee609f3 fixed warning with QFutureWatcher
  • 051a2a3 Added popup to confirm actions "Clear server from Amnesia software" and "Forget this server"
  • da47054 changed element type to confirm container deletion from MessageDialog to PopupWithQuestion
  • 00c4cf3 fixed the width of the buttons in popupWithQuestion
  • 542039d Changed notification text for "Forget this server" action

📊 Changes

12 files changed (+108 additions, -43 deletions)

View changed files

📝 client/containers/containers_defs.cpp (+1 -1)
📝 client/core/servercontroller.cpp (+1 -2)
📝 client/protocols/wireguardprotocol.cpp (+2 -2)
📝 client/protocols/wireguardprotocol.h (+1 -1)
📝 client/resources.qrc (+1 -0)
➕ client/ui/qml/Controls/PopupWithQuestion.qml (+57 -0)
📝 client/ui/qml/Pages/PageServerContainers.qml (+15 -15)
📝 client/ui/qml/Pages/PageServerSettings.qml (+27 -2)
📝 client/ui/qml/Pages/Protocols/PageProtoCloak.qml (+1 -2)
📝 client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml (+1 -5)
📝 client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml (+1 -1)
📝 client/ui/qml/main.qml (+0 -12)

📄 Description

No description provided


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/163 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 1/29/2023 **Status:** ✅ Merged **Merged:** 1/30/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/confirm-on-clear-and-delete-server` --- ### 📝 Commits (5) - [`ee609f3`](https://github.com/amnezia-vpn/amnezia-client/commit/ee609f3e8f92775bb01456f10d86b68cd57e6409) fixed warning with QFutureWatcher - [`051a2a3`](https://github.com/amnezia-vpn/amnezia-client/commit/051a2a3ef2bf0447765fb3829cf99c4bacbb829d) Added popup to confirm actions "Clear server from Amnesia software" and "Forget this server" - [`da47054`](https://github.com/amnezia-vpn/amnezia-client/commit/da47054497a5efb810ddcf585a475b22dae1fe20) changed element type to confirm container deletion from MessageDialog to PopupWithQuestion - [`00c4cf3`](https://github.com/amnezia-vpn/amnezia-client/commit/00c4cf300a171ef54c639a9cb8d30e712c0c8e5c) fixed the width of the buttons in popupWithQuestion - [`542039d`](https://github.com/amnezia-vpn/amnezia-client/commit/542039df01b57e243362d2d1bff36ca50cfc6d98) Changed notification text for "Forget this server" action ### 📊 Changes **12 files changed** (+108 additions, -43 deletions) <details> <summary>View changed files</summary> 📝 `client/containers/containers_defs.cpp` (+1 -1) 📝 `client/core/servercontroller.cpp` (+1 -2) 📝 `client/protocols/wireguardprotocol.cpp` (+2 -2) 📝 `client/protocols/wireguardprotocol.h` (+1 -1) 📝 `client/resources.qrc` (+1 -0) ➕ `client/ui/qml/Controls/PopupWithQuestion.qml` (+57 -0) 📝 `client/ui/qml/Pages/PageServerContainers.qml` (+15 -15) 📝 `client/ui/qml/Pages/PageServerSettings.qml` (+27 -2) 📝 `client/ui/qml/Pages/Protocols/PageProtoCloak.qml` (+1 -2) 📝 `client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml` (+1 -5) 📝 `client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml` (+1 -1) 📝 `client/ui/qml/main.qml` (+0 -12) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
bsakaguchi 2026-10-13 20:46:08 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#1628
No description provided.