AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added a button to scan the server for already installed containers

Browse source 
- refactoring of old code, redundant sections of code removed
This commit is contained in:
vladimir.kuznetsov 2023-02-25 17:59:22 +03:00
parent 480b2181f0
commit 2580475f67
12 changed files with 136 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/ui/pages_logic/WizardLogic.cpp
View file

@ -18,7 +18,7 @@ void WizardLogic::onUpdatePage()
set_radioButtonMediumChecked(true);
}
QMap<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage() const
QPair<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage() const
{
QJsonObject cloakConfig {
{ config_key::container, ContainerProps::containerToString(DockerContainer::Cloak) },
@ -33,27 +33,29 @@ QMap<DockerContainer, QJsonObject> WizardLogic::getInstallConfigsFromWizardPage(
{ config_key::container, ContainerProps::containerToString(DockerContainer::OpenVpn) }
};
QMap<DockerContainer, QJsonObject> containers;
QPair<DockerContainer, QJsonObject> container;
DockerContainer dockerContainer;
if (radioButtonHighChecked()) {
containers.insert(DockerContainer::Cloak, cloakConfig);
container = {DockerContainer::Cloak, cloakConfig};
}
if (radioButtonMediumChecked()) {
containers.insert(DockerContainer::ShadowSocks, ssConfig);
container = {DockerContainer::ShadowSocks, ssConfig};
}
if (radioButtonLowChecked()) {
containers.insert(DockerContainer::OpenVpn, openVpnConfig);
container = {DockerContainer::OpenVpn, openVpnConfig};
}
return containers;
return container;
}
void WizardLogic::onPushButtonVpnModeFinishClicked()
{
auto containers = getInstallConfigsFromWizardPage();
uiLogic()->installServer(containers);
auto container = getInstallConfigsFromWizardPage();
uiLogic()->installServer(container);
if (checkBoxVpnModeChecked()) {
m_settings->setRouteMode(Settings::VpnOnlyForwardSites);
} else {
@ -63,6 +65,6 @@ void WizardLogic::onPushButtonVpnModeFinishClicked()
void WizardLogic::onPushButtonLowFinishClicked()
{
auto containers = getInstallConfigsFromWizardPage();
uiLogic()->installServer(containers);
auto container = getInstallConfigsFromWizardPage();
uiLogic()->installServer(container);
}