andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-20 02:00:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: dev rebase errors

Browse Source
This commit is contained in:
NickVs2015
2026-05-29 17:09:52 +03:00
parent dbabac3bd5
commit 65664d69b9
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/core/controllers/coreController.cpp
+5 -3
View File
@@ -234,10 +234,12 @@ void CoreController::initControllers()
Qt::QueuedConnection);
connect(m_connectionUiController, &ConnectionUiController::requestSetProcessedServer,
this, [this](const QString &serverId) {
m_serversUiController->setProcessedServerIndex(m_serversController->indexOfServerId(serverId));
m_serversUiController->setProcessedServerId(serverId);
}, Qt::QueuedConnection);
connect(m_installUiController, &InstallUiController::currentContainerUpdated,
m_connectionUiController, &ConnectionUiController::onCurrentContainerUpdated);
connect(m_installUiController, &InstallUiController::updateContainerFinished,
m_connectionUiController, [this](const QString &, bool) {
m_connectionUiController->onCurrentContainerUpdated();
});
m_apiNewsUiController = new ApiNewsUiController(m_newsModel, m_newsController, this);
setQmlContextProperty("ApiNewsController", m_apiNewsUiController);
client/ui/controllers/connectionUiController.h
+1
View File
@@ -63,6 +63,7 @@ signals:
void requestUpdateServiceFromGateway(const QString &serverId, const QString &newCountryCode,
const QString &newCountryName, bool reloadServiceConfig);
void requestSetProcessedServer(const QString &serverId);
void reconnectWithUpdatedContainer(const QString &message);
private:
Vpn::ConnectionState getCurrentConnectionState();
client/ui/qml/Pages2/PageSettingsConnectionProtocols.qml
+6 -6
View File
@@ -156,13 +156,13 @@ PageType {
ButtonGroup.group: protocolButtonGroup
checked: root.currentProtocol === "auto"
enabled: !ConnectionController.isConnected || !ServersModel.isDefaultServerCurrentlyProcessed()
enabled: !ConnectionController.isConnected || !ServersUiController.isDefaultServerCurrentlyProcessed()
text: qsTr("Choose automatically")
descriptionText: qsTr("AmneziaWG is used by default. If the connection is unstable, the app will switch to VLESS. On the next launch, AmneziaWG will be tried again")
onClicked: function() {
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
if (ServersUiController.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Cannot change protocol during active connection"))
return
}
@@ -187,12 +187,12 @@ PageType {
ButtonGroup.group: protocolButtonGroup
checked: root.currentProtocol === "awg"
enabled: !ConnectionController.isConnected || !ServersModel.isDefaultServerCurrentlyProcessed()
enabled: !ConnectionController.isConnected || !ServersUiController.isDefaultServerCurrentlyProcessed()
text: qsTr("AmneziaWG")
onClicked: function() {
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
if (ServersUiController.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Cannot change protocol during active connection"))
return
}
@@ -218,12 +218,12 @@ PageType {
ButtonGroup.group: protocolButtonGroup
checked: root.currentProtocol === "vless"
enabled: !ConnectionController.isConnected || !ServersModel.isDefaultServerCurrentlyProcessed()
enabled: !ConnectionController.isConnected || !ServersUiController.isDefaultServerCurrentlyProcessed()
text: qsTr("XRay VLESS Reality")
onClicked: function() {
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
if (ServersUiController.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
PageController.showNotificationMessage(qsTr("Cannot change protocol during active connection"))
return
}