[PR #145] [MERGED] feature/qt6-server-busy-notification #1615

New issue

Closed

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

bsakaguchi commented

2026-10-13 20:46:00 +00:00

Owner

📋 Pull Request Information

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

Base: qt_migration ← Head: feature/qt6-server-busy-notification

📝 Commits (5)

08a8ead added display of a notification that the server is busy installing third-party software
6ec090e added a "Cancel" button to interrupt the server configuration process when it is found that it is busy installing other software
221ea5e Merge branch 'qt_migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-server-busy-notification
9f114a1 Tiny fix [no ci]
580975f Merge branch 'qt_migration' into feature/qt6-server-busy-notification

📊 Changes

23 files changed (+573 additions, -369 deletions)

View changed files

📝 client/CMakeLists.txt (+2 -2)
📝 client/core/defs.h (+1 -0)
📝 client/core/errorstrings.cpp (+1 -0)
📝 client/core/scripts_registry.cpp (+1 -0)
📝 client/core/scripts_registry.h (+2 -1)
📝 client/core/servercontroller.cpp (+43 -5)
📝 client/core/servercontroller.h (+5 -0)
📝 client/resources.qrc (+1 -0)
➕ client/server_scripts/check_server_is_busy.sh (+4 -0)
📝 client/ui/pages_logic/ServerConfiguringProgressLogic.cpp (+84 -21)
📝 client/ui/pages_logic/ServerConfiguringProgressLogic.h (+26 -5)
📝 client/ui/pages_logic/protocols/CloakLogic.cpp (+51 -18)
📝 client/ui/pages_logic/protocols/CloakLogic.h (+8 -0)
📝 client/ui/pages_logic/protocols/OpenVpnLogic.cpp (+52 -19)
📝 client/ui/pages_logic/protocols/OpenVpnLogic.h (+9 -1)
📝 client/ui/pages_logic/protocols/ShadowSocksLogic.cpp (+59 -26)
📝 client/ui/pages_logic/protocols/ShadowSocksLogic.h (+11 -3)
📝 client/ui/qml/Pages/PageServerConfiguringProgress.qml (+32 -4)
📝 client/ui/qml/Pages/Protocols/PageProtoCloak.qml (+35 -5)
📝 client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml (+61 -19)

...and 3 more files

📄 Description

added display of a notification that the server is busy installing third-party software

added a "Cancel" button to interrupt the server configuration process when it is found that it is busy installing other software
refactoring doInstallAction functions

_{🔄 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/145 **Author:** [@Nethius](https://github.com/Nethius) **Created:** 1/1/2023 **Status:** ✅ Merged **Merged:** 1/18/2023 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `qt_migration` ← **Head:** `feature/qt6-server-busy-notification` --- ### 📝 Commits (5) - [`08a8ead`](https://github.com/amnezia-vpn/amnezia-client/commit/08a8eadb49f94edf59ab6b0f28307bc90fa1eaa0) added display of a notification that the server is busy installing third-party software - [`6ec090e`](https://github.com/amnezia-vpn/amnezia-client/commit/6ec090ea0dd5037e25de3af39d5e45df9d57511a) added a "Cancel" button to interrupt the server configuration process when it is found that it is busy installing other software - [`221ea5e`](https://github.com/amnezia-vpn/amnezia-client/commit/221ea5ebb009cdf341bea8acdbf8ff03fc860ecd) Merge branch 'qt_migration' of github.com:amnezia-vpn/desktop-client into feature/qt6-server-busy-notification - [`9f114a1`](https://github.com/amnezia-vpn/amnezia-client/commit/9f114a1dad1354c9b2d63cc7816fbc7d03cbdcc1) Tiny fix [no ci] - [`580975f`](https://github.com/amnezia-vpn/amnezia-client/commit/580975fda17c8912af68de03cf40006cea4d58fd) Merge branch 'qt_migration' into feature/qt6-server-busy-notification ### 📊 Changes **23 files changed** (+573 additions, -369 deletions) <details> <summary>View changed files</summary> 📝 `client/CMakeLists.txt` (+2 -2) 📝 `client/core/defs.h` (+1 -0) 📝 `client/core/errorstrings.cpp` (+1 -0) 📝 `client/core/scripts_registry.cpp` (+1 -0) 📝 `client/core/scripts_registry.h` (+2 -1) 📝 `client/core/servercontroller.cpp` (+43 -5) 📝 `client/core/servercontroller.h` (+5 -0) 📝 `client/resources.qrc` (+1 -0) ➕ `client/server_scripts/check_server_is_busy.sh` (+4 -0) 📝 `client/ui/pages_logic/ServerConfiguringProgressLogic.cpp` (+84 -21) 📝 `client/ui/pages_logic/ServerConfiguringProgressLogic.h` (+26 -5) 📝 `client/ui/pages_logic/protocols/CloakLogic.cpp` (+51 -18) 📝 `client/ui/pages_logic/protocols/CloakLogic.h` (+8 -0) 📝 `client/ui/pages_logic/protocols/OpenVpnLogic.cpp` (+52 -19) 📝 `client/ui/pages_logic/protocols/OpenVpnLogic.h` (+9 -1) 📝 `client/ui/pages_logic/protocols/ShadowSocksLogic.cpp` (+59 -26) 📝 `client/ui/pages_logic/protocols/ShadowSocksLogic.h` (+11 -3) 📝 `client/ui/qml/Pages/PageServerConfiguringProgress.qml` (+32 -4) 📝 `client/ui/qml/Pages/Protocols/PageProtoCloak.qml` (+35 -5) 📝 `client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml` (+61 -19) _...and 3 more files_ </details> ### 📄 Description added display of a notification that the server is busy installing third-party software - added a "Cancel" button to interrupt the server configuration process when it is found that it is busy installing other software - refactoring doInstallAction functions --- <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:00 +00:00

closed this issue
added the
pull-request
label

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#1615

No description provided.

Rows
Columns