Added the advanced settings page

- added a button to scan the server for installed containers
- added a check on the presence of installed containers before configuring the server, if the containers are already installed, then we will add them to the GUI
- added new control element - PopupWarning.qml

client/core/servercontroller.cpp

@@ -415,9 +415,6 @@ ErrorCode ServerController::setupContainer(const ServerCredentials &credentials,
     //qDebug().noquote() << QJsonDocument(config).toJson();
     ErrorCode e = ErrorCode::NoError;
 
-    e = isContainerAlreadyInstalled(credentials, container);
-    if (e) return e;
-
     e = installDockerWorker(credentials, container);
     if (e) return e;
     qDebug().noquote() << "ServerController::setupContainer installDockerWorker finished";
@@ -860,7 +857,7 @@ QString ServerController::replaceVars(const QString &script, const Vars &vars)
     return s;
 }
 
-ErrorCode ServerController::isContainerAlreadyInstalled(const ServerCredentials &credentials, DockerContainer container)
+ErrorCode ServerController::getAlreadyInstalledContainers(const ServerCredentials &credentials, QMap<DockerContainer, QJsonObject> &installedContainers)
 {
     QString stdOut;
     auto cbReadStdOut = [&](const QString &data, QSharedPointer<QSsh::SshRemoteProcess> proc) {
@@ -870,17 +867,36 @@ ErrorCode ServerController::isContainerAlreadyInstalled(const ServerCredentials
         stdOut += data + "\n";
     };
 
-    QString script = QString("sudo docker ps | grep %1").arg(ContainerProps::containerToString(container));
+    QString script = QString("sudo docker ps --format '{{.Names}} {{.Ports}}'");
-
-    ErrorCode errorCode = runScript(credentials,
-                                    replaceVars(script, genVarsForScript(credentials, container)), cbReadStdOut, cbReadStdErr);
 
+    ErrorCode errorCode = runScript(credentials, script, cbReadStdOut, cbReadStdErr);
     if (errorCode != ErrorCode::NoError) {
         return errorCode;
     }
 
-    if (!stdOut.isEmpty()) {
+    auto containersInfo = stdOut.split("\n");
-        return ErrorCode::ServerContainerAlreadyInstalledError;
+    for (auto &containerInfo : containersInfo) {
+        if (containerInfo.isEmpty()) {
+            continue;
         }
+        const static QRegularExpression containerAndPortRegExp("(amnezia-[a-z]*).*?>([0-9]*)/(udp|tcp).*");
+        QRegularExpressionMatch containerAndPortMatch = containerAndPortRegExp.match(containerInfo);
+        if (containerAndPortMatch.hasMatch()) {
+            QString name = containerAndPortMatch.captured(1);
+            QString port = containerAndPortMatch.captured(2);
+            QString transportProto = containerAndPortMatch.captured(3);
+            DockerContainer container = ContainerProps::containerFromString(name);
+            Proto mainProto = ContainerProps::defaultProtocol(container);
+            QJsonObject config {
+                { config_key::container, name },
+                { ProtocolProps::protoToString(mainProto), QJsonObject {
+                        { config_key::port, port },
+                        { config_key::transport_proto, transportProto }}
+                }
+            };
+            installedContainers.insert(container, config);
+        }
+    }
+
     return ErrorCode::NoError;
 }

client/core/servercontroller.h

@@ -74,6 +74,7 @@ public:
     QSsh::SshConnection *connectToHost(const QSsh::SshConnectionParameters &sshParams);
 
     void setCancelInstallation(const bool cancel);
+    ErrorCode getAlreadyInstalledContainers(const ServerCredentials &credentials, QMap<DockerContainer, QJsonObject> &installedContainers);
 private:
 
     ErrorCode installDockerWorker(const ServerCredentials &credentials, DockerContainer container);
@@ -82,7 +83,6 @@ private:
     ErrorCode runContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
     ErrorCode configureContainerWorker(const ServerCredentials &credentials, DockerContainer container, QJsonObject &config);
     ErrorCode startupContainerWorker(const ServerCredentials &credentials, DockerContainer container, const QJsonObject &config = QJsonObject());
-    ErrorCode isContainerAlreadyInstalled(const ServerCredentials &credentials, DockerContainer container);
 
     std::shared_ptr<Settings> m_settings;
     std::shared_ptr<VpnConfigurator> m_configurator;

client/resources.qrc

@@ -164,5 +164,7 @@
         <file>images/svg/settings_suggest_black_24dp.svg</file>
         <file>server_scripts/website_tor/Dockerfile</file>
         <file>ui/qml/Controls/PopupWithQuestion.qml</file>
+        <file>ui/qml/Pages/PageAdvancedServerSettings.qml</file>
+        <file>ui/qml/Controls/PopupWarning.qml</file>
     </qresource>
 </RCC>

client/ui/pages.h

@@ -24,7 +24,7 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
            Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
            GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
            ServerContainers, ServersList, ShareConnection,  Sites,
-           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig};
+           ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings};
 Q_ENUM_NS(Page)
 
 static void declareQmlPageEnum() {

client/ui/pages_logic/AdvancedServerSettingsLogic.cpp

@@ -0,0 +1,63 @@
+#include "AdvancedServerSettingsLogic.h"
+
+#include "VpnLogic.h"
+#include "ui/uilogic.h"
+#include "core/errorstrings.h"
+#include "core/servercontroller.h"
+
+AdvancedServerSettingsLogic::AdvancedServerSettingsLogic(UiLogic *uiLogic, QObject *parent): PageLogicBase(uiLogic, parent),
+      m_labelWaitInfoVisible{true},
+      m_pushButtonClearVisible{true},
+      m_pushButtonClearText{tr("Clear server from Amnezia software")}
+{
+}
+
+void AdvancedServerSettingsLogic::onUpdatePage()
+{
+    set_labelWaitInfoVisible(false);
+    set_labelWaitInfoText("");
+    set_pushButtonClearVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
+    const QJsonObject &server = m_settings->server(uiLogic()->m_selectedServerIndex);
+    const QString &port = server.value(config_key::port).toString();
+
+    const QString &userName = server.value(config_key::userName).toString();
+    const QString &hostName = server.value(config_key::hostName).toString();
+    QString name = QString("%1%2%3%4%5").arg(userName,
+                                             userName.isEmpty() ? "" : "@",
+                                             hostName,
+                                             port.isEmpty() ? "" : ":",
+                                             port);
+
+    set_labelServerText(name);
+
+    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
+    QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
+    set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
+}
+
+void AdvancedServerSettingsLogic::onPushButtonClearServer()
+{
+    set_pageEnabled(false);
+    set_pushButtonClearText(tr("Uninstalling Amnezia software..."));
+
+    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
+        uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
+    }
+
+    ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
+    m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
+    if (e) {
+        uiLogic()->set_dialogConnectErrorText(tr("Error occurred while configuring server.") + "\n" +
+                                              errorString(e) + "\n" + tr("See logs for details."));
+        emit uiLogic()->showConnectErrorDialog();
+    } else {
+        set_labelWaitInfoVisible(true);
+        set_labelWaitInfoText(tr("Amnezia server successfully uninstalled"));
+    }
+
+    m_settings->setContainers(uiLogic()->m_selectedServerIndex, {});
+    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
+
+    set_pageEnabled(true);
+    set_pushButtonClearText(tr("Clear server from Amnezia software"));
+}

client/ui/pages_logic/AdvancedServerSettingsLogic.h

@@ -0,0 +1,30 @@
+#ifndef ADVANCEDSERVERSETTINGSLOGIC_H
+#define ADVANCEDSERVERSETTINGSLOGIC_H
+
+#include "PageLogicBase.h"
+
+class UiLogic;
+
+class AdvancedServerSettingsLogic : public PageLogicBase
+{
+    Q_OBJECT
+
+    AUTO_PROPERTY(bool, labelWaitInfoVisible)
+    AUTO_PROPERTY(QString, labelWaitInfoText)
+
+    AUTO_PROPERTY(QString, pushButtonClearText)
+    AUTO_PROPERTY(bool, pushButtonClearVisible)
+
+    AUTO_PROPERTY(QString, labelServerText)
+    AUTO_PROPERTY(QString, labelCurrentVpnProtocolText)
+
+public:
+    explicit AdvancedServerSettingsLogic(UiLogic *uiLogic, QObject *parent = nullptr);
+    ~AdvancedServerSettingsLogic() = default;
+
+    Q_INVOKABLE void onUpdatePage() override;
+
+    Q_INVOKABLE void onPushButtonClearServer();
+};
+
+#endif // ADVANCEDSERVERSETTINGSLOGIC_H

client/ui/pages_logic/GeneralSettingsLogic.cpp

@@ -12,29 +12,29 @@ GeneralSettingsLogic::GeneralSettingsLogic(UiLogic *logic, QObject *parent):
 
 void GeneralSettingsLogic::onUpdatePage()
 {
-    uiLogic()->selectedServerIndex = m_settings->defaultServerIndex();
+    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    set_existsAnyServer(uiLogic()->selectedServerIndex >= 0);
+    set_existsAnyServer(uiLogic()->m_selectedServerIndex >= 0);
-    uiLogic()->selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
+    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
 
     set_pushButtonGeneralSettingsShareConnectionEnable(m_settings->haveAuthData(m_settings->defaultServerIndex()));
 }
 
 void GeneralSettingsLogic::onPushButtonGeneralSettingsServerSettingsClicked()
 {
-    uiLogic()->selectedServerIndex = m_settings->defaultServerIndex();
+    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    uiLogic()->selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
+    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(m_settings->defaultServerIndex());
 
     emit uiLogic()->goToPage(Page::ServerSettings);
 }
 
 void GeneralSettingsLogic::onPushButtonGeneralSettingsShareConnectionClicked()
 {
-    uiLogic()->selectedServerIndex = m_settings->defaultServerIndex();
+    uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-    uiLogic()->selectedDockerContainer = m_settings->defaultContainer(uiLogic()->selectedServerIndex);
+    uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
 
-    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedServerIndex(uiLogic()->selectedServerIndex);
+    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
-    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedDockerContainer(uiLogic()->selectedDockerContainer);
+    qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel())->setSelectedDockerContainer(uiLogic()->m_selectedDockerContainer);
 
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     emit uiLogic()->goToPage(Page::ShareConnection);
 }

client/ui/pages_logic/ServerContainersLogic.cpp

@@ -24,34 +24,34 @@ ServerContainersLogic::ServerContainersLogic(UiLogic *logic, QObject *parent):
 void ServerContainersLogic::onUpdatePage()
 {
     ContainersModel *c_model = qobject_cast<ContainersModel *>(uiLogic()->containersModel());
-    c_model->setSelectedServerIndex(uiLogic()->selectedServerIndex);
+    c_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
     ProtocolsModel *p_model = qobject_cast<ProtocolsModel *>(uiLogic()->protocolsModel());
-    p_model->setSelectedServerIndex(uiLogic()->selectedServerIndex);
+    p_model->setSelectedServerIndex(uiLogic()->m_selectedServerIndex);
 
-    set_isManagedServer(m_settings->haveAuthData(uiLogic()->selectedServerIndex));
+    set_isManagedServer(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
     emit updatePage();
 }
 
 void ServerContainersLogic::onPushButtonProtoSettingsClicked(DockerContainer c, Proto p)
 {
     qDebug()<< "ServerContainersLogic::onPushButtonProtoSettingsClicked" << c << p;
-    uiLogic()->selectedDockerContainer = c;
+    uiLogic()->m_selectedDockerContainer = c;
-    uiLogic()->protocolLogic(p)->updateProtocolPage(m_settings->protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, p),
+    uiLogic()->protocolLogic(p)->updateProtocolPage(m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, p),
-                      uiLogic()->selectedDockerContainer,
+                      uiLogic()->m_selectedDockerContainer,
-                      m_settings->haveAuthData(uiLogic()->selectedServerIndex));
+                      m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
 
     emit uiLogic()->goToProtocolPage(p);
 }
 
 void ServerContainersLogic::onPushButtonDefaultClicked(DockerContainer c)
 {
-    if (m_settings->defaultContainer(uiLogic()->selectedServerIndex) == c) return;
+    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == c) return;
 
-    m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, c);
+    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c);
     uiLogic()->onUpdateAllPages();
 
-    if (uiLogic()->selectedServerIndex != m_settings->defaultServerIndex()) return;
+    if (uiLogic()->m_selectedServerIndex != m_settings->defaultServerIndex()) return;
     if (!uiLogic()->m_vpnConnection) return;
     if (!uiLogic()->m_vpnConnection->isConnected()) return;
 
@@ -61,21 +61,21 @@ void ServerContainersLogic::onPushButtonDefaultClicked(DockerContainer c)
 
 void ServerContainersLogic::onPushButtonShareClicked(DockerContainer c)
 {
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->selectedServerIndex, c);
+    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, c);
     emit uiLogic()->goToPage(Page::ShareConnection);
 }
 
 void ServerContainersLogic::onPushButtonRemoveClicked(DockerContainer container)
 {
     //buttonSetEnabledFunc(false);
-    ErrorCode e = m_serverController->removeContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex), container);
+    ErrorCode e = m_serverController->removeContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), container);
-    m_settings->removeContainerConfig(uiLogic()->selectedServerIndex, container);
+    m_settings->removeContainerConfig(uiLogic()->m_selectedServerIndex, container);
     //buttonSetEnabledFunc(true);
 
-    if (m_settings->defaultContainer(uiLogic()->selectedServerIndex) == container) {
+    if (m_settings->defaultContainer(uiLogic()->m_selectedServerIndex) == container) {
-        const auto &c = m_settings->containers(uiLogic()->selectedServerIndex);
+        const auto &c = m_settings->containers(uiLogic()->m_selectedServerIndex);
-        if (c.isEmpty()) m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, DockerContainer::None);
+        if (c.isEmpty()) m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
-        else m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, c.keys().first());
+        else m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c.keys().first());
     }
     uiLogic()->onUpdateAllPages();
 }
@@ -87,14 +87,21 @@ void ServerContainersLogic::onPushButtonContinueClicked(DockerContainer c, int p
     emit uiLogic()->goToPage(Page::ServerConfiguringProgress);
     qApp->processEvents();
 
-    ErrorCode error = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, c, &config](){
+    uiLogic()->getInstalledContainers(false); //todo its work like should be?
-        return m_serverController->setupContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex), c, config);
-    });
 
-    if (error == ErrorCode::NoError || error == ErrorCode::ServerContainerAlreadyInstalledError) {
+    ServerCredentials credentials = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex);
-        m_settings->setContainerConfig(uiLogic()->selectedServerIndex, c, config);
+
+    if (!uiLogic()->isContainerAlreadyAddedToGui(c, credentials)) {
+        auto installAction = [this, c, &config](){
+            return m_serverController->setupContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex), c, config);
+        };
+        ErrorCode error = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction);
+
+        if (error == ErrorCode::NoError) {
+            m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, c, config);
             if (ContainerProps::containerService(c) == ServiceType::Vpn) {
-            m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, c);
+                m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, c);
+            }
         }
     }
 

client/ui/pages_logic/ServerListLogic.cpp

@@ -20,7 +20,7 @@ void ServerListLogic::onServerListPushbuttonDefaultClicked(int index)
 
 void ServerListLogic::onServerListPushbuttonSettingsClicked(int index)
 {
-    uiLogic()->selectedServerIndex = index;
+    uiLogic()->m_selectedServerIndex = index;
     uiLogic()->goToPage(Page::ServerSettings);
 }
 

client/ui/pages_logic/ServerSettingsLogic.cpp

@@ -27,10 +27,10 @@ void ServerSettingsLogic::onUpdatePage()
 {
     set_labelWaitInfoVisible(false);
     set_labelWaitInfoText("");
-    set_pushButtonClearVisible(m_settings->haveAuthData(uiLogic()->selectedServerIndex));
+    set_pushButtonClearVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    set_pushButtonClearClientCacheVisible(m_settings->haveAuthData(uiLogic()->selectedServerIndex));
+    set_pushButtonClearClientCacheVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    set_pushButtonShareFullVisible(m_settings->haveAuthData(uiLogic()->selectedServerIndex));
+    set_pushButtonShareFullVisible(m_settings->haveAuthData(uiLogic()->m_selectedServerIndex));
-    const QJsonObject &server = m_settings->server(uiLogic()->selectedServerIndex);
+    const QJsonObject &server = m_settings->server(uiLogic()->m_selectedServerIndex);
     const QString &port = server.value(config_key::port).toString();
 
     const QString &userName = server.value(config_key::userName).toString();
@@ -45,7 +45,7 @@ void ServerSettingsLogic::onUpdatePage()
     set_labelServerText(name);
     set_lineEditDescriptionText(server.value(config_key::description).toString());
 
-    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->selectedServerIndex);
+    DockerContainer selectedContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
     QString selectedContainerName = ContainerProps::containerHumanNames().value(selectedContainer);
     set_labelCurrentVpnProtocolText(tr("Service: ") + selectedContainerName);
 }
@@ -55,12 +55,12 @@ void ServerSettingsLogic::onPushButtonClearServer()
     set_pageEnabled(false);
     set_pushButtonClearText(tr("Uninstalling Amnezia software..."));
 
-    if (m_settings->defaultServerIndex() == uiLogic()->selectedServerIndex) {
+    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
         uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
     }
 
-    ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->selectedServerIndex));
+    ErrorCode e = m_serverController->removeAllContainers(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
-    m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->selectedServerIndex));
+    m_serverController->disconnectFromHost(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex));
     if (e) {
         uiLogic()->set_dialogConnectErrorText(
                     tr("Error occurred while configuring server.") + "\n" +
@@ -73,8 +73,8 @@ void ServerSettingsLogic::onPushButtonClearServer()
         set_labelWaitInfoText(tr("Amnezia server successfully uninstalled"));
     }
 
-    m_settings->setContainers(uiLogic()->selectedServerIndex, {});
+    m_settings->setContainers(uiLogic()->m_selectedServerIndex, {});
-    m_settings->setDefaultContainer(uiLogic()->selectedServerIndex, DockerContainer::None);
+    m_settings->setDefaultContainer(uiLogic()->m_selectedServerIndex, DockerContainer::None);
 
     set_pageEnabled(true);
     set_pushButtonClearText(tr("Clear server from Amnezia software"));
@@ -82,15 +82,15 @@ void ServerSettingsLogic::onPushButtonClearServer()
 
 void ServerSettingsLogic::onPushButtonForgetServer()
 {
-    if (m_settings->defaultServerIndex() == uiLogic()->selectedServerIndex && uiLogic()->m_vpnConnection->isConnected()) {
+    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex && uiLogic()->m_vpnConnection->isConnected()) {
         uiLogic()->pageLogic<VpnLogic>()->onDisconnect();
     }
-    m_settings->removeServer(uiLogic()->selectedServerIndex);
+    m_settings->removeServer(uiLogic()->m_selectedServerIndex);
 
-    if (m_settings->defaultServerIndex() == uiLogic()->selectedServerIndex) {
+    if (m_settings->defaultServerIndex() == uiLogic()->m_selectedServerIndex) {
         m_settings->setDefaultServer(0);
     }
-    else if (m_settings->defaultServerIndex() > uiLogic()->selectedServerIndex) {
+    else if (m_settings->defaultServerIndex() > uiLogic()->m_selectedServerIndex) {
         m_settings->setDefaultServer(m_settings->defaultServerIndex() - 1);
     }
 
@@ -99,7 +99,7 @@ void ServerSettingsLogic::onPushButtonForgetServer()
     }
 
 
-    uiLogic()->selectedServerIndex = -1;
+    uiLogic()->m_selectedServerIndex = -1;
     uiLogic()->onUpdateAllPages();
 
     if (m_settings->serversCount() == 0) {
@@ -114,9 +114,9 @@ void ServerSettingsLogic::onPushButtonClearClientCacheClicked()
 {
     set_pushButtonClearClientCacheText(tr("Cache cleared"));
 
-    const auto &containers = m_settings->containers(uiLogic()->selectedServerIndex);
+    const auto &containers = m_settings->containers(uiLogic()->m_selectedServerIndex);
     for (DockerContainer container : containers.keys()) {
-        m_settings->clearLastConnectionConfig(uiLogic()->selectedServerIndex, container);
+        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, container);
     }
 
     QTimer::singleShot(3000, this, [this]() {
@@ -127,9 +127,9 @@ void ServerSettingsLogic::onPushButtonClearClientCacheClicked()
 void ServerSettingsLogic::onLineEditDescriptionEditingFinished()
 {
     const QString &newText = lineEditDescriptionText();
-    QJsonObject server = m_settings->server(uiLogic()->selectedServerIndex);
+    QJsonObject server = m_settings->server(uiLogic()->m_selectedServerIndex);
     server.insert(config_key::description, newText);
-    m_settings->editServer(uiLogic()->selectedServerIndex, server);
+    m_settings->editServer(uiLogic()->m_selectedServerIndex, server);
     uiLogic()->onUpdateAllPages();
 }
 
@@ -168,7 +168,7 @@ void ServerSettingsLogic::onPushButtonShareFullClicked()
         }
     }
 #else
-    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->selectedServerIndex, DockerContainer::None);
+    uiLogic()->pageLogic<ShareConnectionLogic>()->updateSharingPage(uiLogic()->m_selectedServerIndex, DockerContainer::None);
     emit uiLogic()->goToShareProtocolPage(Proto::Any);
 #endif
 }

client/ui/pages_logic/ShareConnectionLogic.cpp

@@ -68,8 +68,8 @@ void ShareConnectionLogic::onPushButtonShareAmneziaGenerateClicked()
     set_shareAmneziaQrCodeTextSeriesLength(0);
 
     QJsonObject serverConfig;
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
 
     // Full access
     if (shareFullAccess()) {
@@ -127,8 +127,8 @@ void ShareConnectionLogic::onPushButtonShareAmneziaGenerateClicked()
 
 void ShareConnectionLogic::onPushButtonShareOpenVpnGenerateClicked()
 {
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
     ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
 
     const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
@@ -142,8 +142,8 @@ void ShareConnectionLogic::onPushButtonShareOpenVpnGenerateClicked()
 
 void ShareConnectionLogic::onPushButtonShareShadowSocksGenerateClicked()
 {
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
     ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
 
     QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, Proto::ShadowSocks);
@@ -186,8 +186,8 @@ void ShareConnectionLogic::onPushButtonShareShadowSocksGenerateClicked()
 
 void ShareConnectionLogic::onPushButtonShareCloakGenerateClicked()
 {
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
     ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
 
     QJsonObject protoConfig = m_settings->protocolConfig(serverIndex, container, Proto::Cloak);
@@ -209,8 +209,8 @@ void ShareConnectionLogic::onPushButtonShareCloakGenerateClicked()
 
 void ShareConnectionLogic::onPushButtonShareWireGuardGenerateClicked()
 {
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
     ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
 
     const QJsonObject &containerConfig = m_settings->containerConfig(serverIndex, container);
@@ -236,8 +236,8 @@ void ShareConnectionLogic::onPushButtonShareWireGuardGenerateClicked()
 
 void ShareConnectionLogic::onPushButtonShareIkev2GenerateClicked()
 {
-    int serverIndex = uiLogic()->selectedServerIndex;
+    int serverIndex = uiLogic()->m_selectedServerIndex;
-    DockerContainer container = uiLogic()->selectedDockerContainer;
+    DockerContainer container = uiLogic()->m_selectedDockerContainer;
     ServerCredentials credentials = m_settings->serverCredentials(serverIndex);
 
     Ikev2Configurator::ConnectionData connData = m_configurator->ikev2Configurator->prepareIkev2Config(credentials, container);
@@ -259,8 +259,8 @@ void ShareConnectionLogic::onPushButtonShareIkev2GenerateClicked()
 
 void ShareConnectionLogic::updateSharingPage(int serverIndex, DockerContainer container)
 {
-    uiLogic()->selectedDockerContainer = container;
+    uiLogic()->m_selectedDockerContainer = container;
-    uiLogic()->selectedServerIndex = serverIndex;
+    uiLogic()->m_selectedServerIndex = serverIndex;
     set_shareFullAccess(container == DockerContainer::None);
 
     m_shareAmneziaQrCodeTextSeries.clear();

client/ui/pages_logic/StartPageLogic.cpp

@@ -155,7 +155,7 @@ void StartPageLogic::onPushButtonConnect()
     set_pushButtonConnectEnabled(true);
     set_pushButtonConnectText(tr("Connect"));
 
-    uiLogic()->installCredentials = serverCredentials;
+    uiLogic()->m_installCredentials = serverCredentials;
     if (ok) emit uiLogic()->goToPage(Page::NewServer);
 }
 

client/ui/pages_logic/ViewConfigLogic.cpp

@@ -79,8 +79,8 @@ void ViewConfigLogic::importConfig()
 
 
     if (!configJson().contains(config_key::containers) || configJson().value(config_key::containers).toArray().isEmpty()) {
-        uiLogic()->selectedServerIndex = m_settings->defaultServerIndex();
+        uiLogic()->m_selectedServerIndex = m_settings->defaultServerIndex();
-        uiLogic()->selectedDockerContainer = m_settings->defaultContainer(uiLogic()->selectedServerIndex);
+        uiLogic()->m_selectedDockerContainer = m_settings->defaultContainer(uiLogic()->m_selectedServerIndex);
         uiLogic()->onUpdateAllPages();
         emit uiLogic()->goToPage(Page::Vpn);
         emit uiLogic()->setStartPage(Page::Vpn);

client/ui/pages_logic/protocols/CloakLogic.cpp

@@ -55,10 +55,10 @@ QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
 
 void CloakLogic::onPushButtonSaveClicked()
 {
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Proto::Cloak);
+    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::Cloak);
     protocolConfig = getProtocolConfigFromPage(protocolConfig);
 
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     QJsonObject newContainerConfig = containerConfig;
     newContainerConfig.insert(ProtocolProps::protoToString(Proto::Cloak), protocolConfig);
 
@@ -113,8 +113,8 @@ void CloakLogic::onPushButtonSaveClicked()
     progressBarFunc.setTextVisibleFunc(true);
     progressBarFunc.setTextFunc(QString("Configuring..."));
     ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, containerConfig, &newContainerConfig](){
-        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex),
+        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->selectedDockerContainer,
+                                                   uiLogic()->m_selectedDockerContainer,
                                                    containerConfig,
                                                    newContainerConfig);
     },
@@ -123,11 +123,11 @@ void CloakLogic::onPushButtonSaveClicked()
     busyInfoFuncy, cancelButtonFunc);
 
     if (!e) {
-        m_settings->setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig);
+        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     }
 
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->selectedServerIndex << uiLogic()->selectedDockerContainer;
+    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
 }
 
 void CloakLogic::onPushButtonCancelClicked()

client/ui/pages_logic/protocols/OpenVpnLogic.cpp

@@ -105,10 +105,10 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
 
 void OpenVpnLogic::onPushButtonSaveClicked()
 {
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Proto::OpenVpn);
+    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::OpenVpn);
     protocolConfig = getProtocolConfigFromPage(protocolConfig);
 
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     QJsonObject newContainerConfig = containerConfig;
     newContainerConfig.insert(ProtocolProps::protoToString(Proto::OpenVpn), protocolConfig);
 
@@ -163,8 +163,8 @@ void OpenVpnLogic::onPushButtonSaveClicked()
     progressBarFunc.setTextVisibleFunc(true);
     progressBarFunc.setTextFunc(QString("Configuring..."));
     ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, containerConfig, &newContainerConfig](){
-        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex),
+        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->selectedDockerContainer,
+                                                   uiLogic()->m_selectedDockerContainer,
                                                    containerConfig,
                                                    newContainerConfig);
     },
@@ -173,10 +173,10 @@ void OpenVpnLogic::onPushButtonSaveClicked()
     busyInfoFuncy, cancelButtonFunc);
 
     if (!e) {
-        m_settings->setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig);
+        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     }
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->selectedServerIndex << uiLogic()->selectedDockerContainer;
+    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
 }
 
 QJsonObject OpenVpnLogic::getProtocolConfigFromPage(QJsonObject oldConfig)

client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp

@@ -81,7 +81,7 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
 {
     QString mountPath;
     QString cmd;
-    QString host = m_settings->serverCredentials(uiLogic()->selectedServerIndex).hostName;
+    QString host = m_settings->serverCredentials(uiLogic()->m_selectedServerIndex).hostName;
 
 
 #ifdef Q_OS_WINDOWS

client/ui/pages_logic/protocols/ShadowSocksLogic.cpp

@@ -49,9 +49,9 @@ QJsonObject ShadowSocksLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
 
 void ShadowSocksLogic::onPushButtonSaveClicked()
 {
-    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Proto::ShadowSocks);
+    QJsonObject protocolConfig = m_settings->protocolConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, Proto::ShadowSocks);
 
-    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+    QJsonObject containerConfig = m_settings->containerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     QJsonObject newContainerConfig = containerConfig;
     newContainerConfig.insert(ProtocolProps::protoToString(Proto::ShadowSocks), protocolConfig);
     ServerConfiguringProgressLogic::PageFunc pageFunc;
@@ -105,8 +105,8 @@ void ShadowSocksLogic::onPushButtonSaveClicked()
     progressBarFunc.setTextVisibleFunc(true);
     progressBarFunc.setTextFunc(QString("Configuring..."));
     ErrorCode e = uiLogic()->pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([this, containerConfig, &newContainerConfig](){
-        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->selectedServerIndex),
+        return m_serverController->updateContainer(m_settings->serverCredentials(uiLogic()->m_selectedServerIndex),
-                                                   uiLogic()->selectedDockerContainer,
+                                                   uiLogic()->m_selectedDockerContainer,
                                                    containerConfig,
                                                    newContainerConfig);
     },
@@ -115,10 +115,10 @@ void ShadowSocksLogic::onPushButtonSaveClicked()
     busyInfoFuncy, cancelButtonFunc);
 
     if (!e) {
-        m_settings->setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig);
+        m_settings->setContainerConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer, newContainerConfig);
-        m_settings->clearLastConnectionConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer);
+        m_settings->clearLastConnectionConfig(uiLogic()->m_selectedServerIndex, uiLogic()->m_selectedDockerContainer);
     }
-    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->selectedServerIndex << uiLogic()->selectedDockerContainer;
+    qDebug() << "Protocol saved with code:" << e << "for" << uiLogic()->m_selectedServerIndex << uiLogic()->m_selectedDockerContainer;
 }
 
 void ShadowSocksLogic::onPushButtonCancelClicked()

client/ui/qml/Controls/PopupWarning.qml

@@ -0,0 +1,34 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+
+Popup {
+    id: root
+
+    property string popupWarningText
+
+    anchors.centerIn: Overlay.overlay
+    modal: true
+    closePolicy: Popup.NoAutoClose
+    width: parent.width - 20
+
+    ColumnLayout {
+        width: parent.width
+        Text {
+            horizontalAlignment: Text.AlignHCenter
+            Layout.fillWidth: true
+            wrapMode: Text.WordWrap
+            font.pixelSize: 16
+            text: root.popupWarningText
+        }
+
+        BlueButtonType {
+            Layout.preferredWidth: parent.width / 2
+            Layout.fillWidth: true
+            text: "Continue"
+            onClicked: {
+                root.close()
+            }
+        }
+    }
+}

client/ui/qml/Pages/PageAdvancedServerSettings.qml

@@ -0,0 +1,100 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import PageEnum 1.0
+import "./"
+import "../Controls"
+import "../Config"
+
+PageBase {
+    id: root
+    page: PageEnum.AdvancedServerSettings
+    logic: AdvancedServerSettingsLogic
+
+    enabled: AdvancedServerSettingsLogic.pageEnabled
+
+    BackButton {
+        id: back
+    }
+    Caption {
+        id: caption
+        text: qsTr("Advanced server settings")
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
+
+    FlickableType {
+        id: fl
+        anchors.top: caption.bottom
+        anchors.bottom: logo.top
+        contentHeight: content.height
+
+        ColumnLayout {
+            id: content
+            enabled: logic.pageEnabled
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.right: parent.right
+            anchors.rightMargin: 15
+
+            LabelType {
+                Layout.fillWidth: true
+                font.pixelSize: 20
+                horizontalAlignment: Text.AlignHCenter
+                text: AdvancedServerSettingsLogic.labelCurrentVpnProtocolText
+            }
+
+            TextFieldType {
+                Layout.fillWidth: true
+                font.pixelSize: 20
+                horizontalAlignment: Text.AlignHCenter
+                text: AdvancedServerSettingsLogic.labelServerText
+                readOnly: true
+                background: Item {}
+            }
+
+            LabelType {
+                Layout.fillWidth: true
+                text: AdvancedServerSettingsLogic.labelWaitInfoText
+                visible: AdvancedServerSettingsLogic.labelWaitInfoVisible
+            }
+
+            BlueButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+                text: "Scan the server for installed containers"
+                visible: AdvancedServerSettingsLogic.pushButtonClearVisible
+                onClicked: {
+                    UiLogic.getInstalledContainers(false)
+                }
+            }
+
+            BlueButtonType {
+                Layout.fillWidth: true
+                Layout.topMargin: 10
+                text: AdvancedServerSettingsLogic.pushButtonClearText
+                visible: AdvancedServerSettingsLogic.pushButtonClearVisible
+                onClicked: {
+                    popupClearServer.open()
+                }
+            }
+
+            PopupWithQuestion {
+                id: popupClearServer
+                questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
+                yesFunc: function() {
+                    AdvancedServerSettingsLogic.onPushButtonClearServer()
+                    close()
+                }
+                noFunc: function() {
+                    close()
+                }
+            }
+        }
+    }
+
+
+    Logo {
+        id : logo
+        anchors.bottom: parent.bottom
+    }
+}

client/ui/qml/Pages/PageServerSettings.qml

@@ -74,6 +74,7 @@ PageBase {
                     UiLogic.goToPage(PageEnum.ServerContainers)
                 }
             }
+
             BlueButtonType {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
@@ -86,33 +87,21 @@ PageBase {
 
             BlueButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 60
+                Layout.topMargin: 10
-                text: ServerSettingsLogic.pushButtonClearClientCacheText
+                text: qsTr("Advanced server settings")
-                visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
+                visible: ServerSettingsLogic.pushButtonShareFullVisible //todo
                 onClicked: {
-                    ServerSettingsLogic.onPushButtonClearClientCacheClicked()
+                    UiLogic.goToPage(PageEnum.AdvancedServerSettings)
                 }
             }
 
             BlueButtonType {
                 Layout.fillWidth: true
-                Layout.topMargin: 10
+                Layout.topMargin: 60
-                text: ServerSettingsLogic.pushButtonClearText
+                text: ServerSettingsLogic.pushButtonClearClientCacheText
-                visible: ServerSettingsLogic.pushButtonClearVisible
+                visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
                 onClicked: {
-                    popupClearServer.open()
+                    ServerSettingsLogic.onPushButtonClearClientCacheClicked()
-                }
-            }
-
-            PopupWithQuestion {
-                id: popupClearServer
-                questionText: "Attention! All containers will be deleted on the server. This means that configuration files, keys and certificates will be deleted. Continue?"
-                yesFunc: function() {
-                    ServerSettingsLogic.onPushButtonClearServer()
-                    close()
-                }
-                noFunc: function() {
-                    close()
                 }
             }
 

client/ui/qml/main.qml

@@ -230,6 +230,10 @@ Window  {
         function onToggleLogPanel() {
             drawer_log.visible = !drawer_log.visible
         }
+        function onShowWarningMessage(message) {
+            popupWarning.popupWarningText = message
+            popupWarning.open()
+        }
     }
 
     MessageDialog {
@@ -353,4 +357,8 @@ Window  {
             }
         }
     }
+
+    PopupWarning {
+        id: popupWarning
+    }
 }

client/ui/uilogic.cpp

@@ -67,6 +67,7 @@
 #include "pages_logic/ViewConfigLogic.h"
 #include "pages_logic/VpnLogic.h"
 #include "pages_logic/WizardLogic.h"
+#include "pages_logic/AdvancedServerSettingsLogic.h"
 
 #include "pages_logic/protocols/CloakLogic.h"
 #include "pages_logic/protocols/OpenVpnLogic.h"
@@ -157,7 +158,7 @@ void UiLogic::initalizeUiLogic()
         emit goToPage(Page::Start, true, false);
     }
 
-    selectedServerIndex = m_settings->defaultServerIndex();
+    m_selectedServerIndex = m_settings->defaultServerIndex();
 
     qInfo().noquote() << QString("Started %1 version %2").arg(APPLICATION_NAME).arg(APP_VERSION);
     qInfo().noquote() << QString("%1 (%2)").arg(QSysInfo::prettyProductName()).arg(QSysInfo::currentCpuArchitecture());
@@ -199,8 +200,8 @@ void UiLogic::keyPressEvent(Qt::Key key)
         qApp->quit();
         break;
     case Qt::Key_H:
-        selectedServerIndex = m_settings->defaultServerIndex();
+        m_selectedServerIndex = m_settings->defaultServerIndex();
-        selectedDockerContainer = m_settings->defaultContainer(selectedServerIndex);
+        m_selectedDockerContainer = m_settings->defaultContainer(m_selectedServerIndex);
 
         //updateSharingPage(selectedServerIndex, m_settings->serverCredentials(selectedServerIndex), selectedDockerContainer);
         emit goToPage(Page::ShareConnection);
@@ -214,7 +215,7 @@ void UiLogic::keyPressEvent(Qt::Key key)
         emit goToPage(Page::Start);
         break;
     case Qt::Key_S:
-        selectedServerIndex = m_settings->defaultServerIndex();
+        m_selectedServerIndex = m_settings->defaultServerIndex();
         emit goToPage(Page::ServerSettings);
         break;
     case Qt::Key_P:
@@ -262,8 +263,8 @@ QString UiLogic::containerDesc(int container)
 
 void UiLogic::onGotoCurrentProtocolsPage()
 {
-    selectedServerIndex = m_settings->defaultServerIndex();
+    m_selectedServerIndex = m_settings->defaultServerIndex();
-    selectedDockerContainer = m_settings->defaultContainer(selectedServerIndex);
+    m_selectedDockerContainer = m_settings->defaultContainer(m_selectedServerIndex);
     emit goToPage(Page::ServerContainers);
 }
 
@@ -325,24 +326,44 @@ void UiLogic::installServer(QMap<DockerContainer, QJsonObject> &containers)
         pageLogic<ServerConfiguringProgressLogic>()->set_pushButtonCancelVisible(visible);
     };
 
-    int count = 0;
+    ErrorCode error = getInstalledContainers(true);
-    ErrorCode error;
+    if (error != ErrorCode::NoError) {
-    for (QMap<DockerContainer, QJsonObject>::iterator i = containers.begin(); i != containers.end(); i++, count++) {
+        return;
-        progressBarFunc.setTextFunc(QString("Installing %1 %2 %3").arg(count+1).arg(tr("of")).arg(containers.size()));
+    }
-
+
-        error = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction([&] () {
+    int count = 0;
-            return m_serverController->setupContainer(installCredentials, i.key(), i.value());
+    bool isSomethingInstalled = false;
-        }, pageFunc, progressBarFunc, noButton, waitInfoFunc, busyInfoFunc, cancelButtonFunc);
+    for (QMap<DockerContainer, QJsonObject>::iterator i = containers.begin(); i != containers.end(); i++, count++) {
-
+        if (isContainerAlreadyAddedToGui(i.key(), m_installCredentials)) {
-        m_serverController->disconnectFromHost(installCredentials);
+            continue;
+        }
+
+        isSomethingInstalled = true;
+
+        progressBarFunc.setTextFunc(QString("Installing %1 %2 %3").arg(count + 1).arg(tr("of")).arg(containers.size()));
+        auto installAction = [&] () {
+            return m_serverController->setupContainer(m_installCredentials, i.key(), i.value());
+        };
+        error = pageLogic<ServerConfiguringProgressLogic>()->doInstallAction(installAction, pageFunc, progressBarFunc,
+                                                                             noButton, waitInfoFunc,
+                                                                             busyInfoFunc, cancelButtonFunc);
+
+        m_serverController->disconnectFromHost(m_installCredentials);
+    }
+
+    if (error == ErrorCode::NoError) {
+        if (!isSomethingInstalled) {
+            emit showWarningMessage("Attention! The container you are trying to install is already installed on the server. "
+                                    "All installed containers have been added to the application ");
+            emit setStartPage(Page::Vpn);
+            return;
         }
 
-    if (error == ErrorCode::NoError || error == ErrorCode::ServerContainerAlreadyInstalledError) {
         QJsonObject server;
-        server.insert(config_key::hostName, installCredentials.hostName);
+        server.insert(config_key::hostName, m_installCredentials.hostName);
-        server.insert(config_key::userName, installCredentials.userName);
+        server.insert(config_key::userName, m_installCredentials.userName);
-        server.insert(config_key::password, installCredentials.password);
+        server.insert(config_key::password, m_installCredentials.password);
-        server.insert(config_key::port, installCredentials.port);
+        server.insert(config_key::port, m_installCredentials.port);
         server.insert(config_key::description, m_settings->nextAvailableServerName());
 
         QJsonArray containerConfigs;
@@ -358,8 +379,7 @@ void UiLogic::installServer(QMap<DockerContainer, QJsonObject> &containers)
 
         emit setStartPage(Page::Vpn);
         qApp->processEvents();
-    }
+    } else {
-    else {
         emit closePage();
     }
 }
@@ -497,4 +517,61 @@ void UiLogic::registerPagesLogic()
     registerPageLogic<ViewConfigLogic>();
     registerPageLogic<VpnLogic>();
     registerPageLogic<WizardLogic>();
+    registerPageLogic<AdvancedServerSettingsLogic>();
+}
+
+ErrorCode UiLogic::getInstalledContainers(bool addNewServerToGui)
+{
+    QMap<DockerContainer, QJsonObject> installedContainers;
+    ErrorCode errorCode = m_serverController->getAlreadyInstalledContainers(m_installCredentials, installedContainers);
+    if (errorCode != ErrorCode::NoError) {
+        return errorCode;
+    }
+
+    QJsonObject server;
+    QJsonArray containerConfigs;
+    if (addNewServerToGui) {
+        server.insert(config_key::hostName, m_installCredentials.hostName);
+        server.insert(config_key::userName, m_installCredentials.userName);
+        server.insert(config_key::password, m_installCredentials.password);
+        server.insert(config_key::port, m_installCredentials.port);
+        server.insert(config_key::description, m_settings->nextAvailableServerName());
+    }
+
+    for (auto container = installedContainers.begin(); container != installedContainers.end(); container++) {
+        if (isContainerAlreadyAddedToGui(container.key(), m_installCredentials)) {
+            continue;
+        }
+
+        if (addNewServerToGui) {
+            containerConfigs.append(container.value());
+            server.insert(config_key::containers, containerConfigs);
+
+        } else {
+            m_settings->setContainerConfig(m_selectedServerIndex, container.key(), container.value());
+        }
+    }
+
+    if (addNewServerToGui) {
+        server.insert(config_key::defaultContainer, ContainerProps::containerToString(installedContainers.firstKey()));
+        m_settings->addServer(server);
+        m_settings->setDefaultServer(m_settings->serversCount() - 1);
+    }
+
+    onUpdateAllPages();
+    return ErrorCode::NoError;
+}
+
+bool UiLogic::isContainerAlreadyAddedToGui(DockerContainer container, const ServerCredentials &selectedServerCredentials)
+{
+    for (int i = 0; i < m_settings->serversCount(); i++) {
+        const ServerCredentials credentials = m_settings->serverCredentials(i);
+        if (selectedServerCredentials.hostName == credentials.hostName && selectedServerCredentials.port == credentials.port) {
+            const QJsonObject containerConfig = m_settings->containerConfig(i, container);
+            if (!containerConfig.isEmpty()) {
+                return true;
+            }
+        }
+    }
+    return false;
 }

client/ui/uilogic.h

@@ -42,6 +42,7 @@ class StartPageLogic;
 class ViewConfigLogic;
 class VpnLogic;
 class WizardLogic;
+class AdvancedServerSettingsLogic;
 
 class PageProtocolLogicBase;
 class OpenVpnLogic;
@@ -61,6 +62,7 @@ class UiLogic : public QObject
     AUTO_PROPERTY(int, pagesStackDepth)
     AUTO_PROPERTY(int, currentPageValue)
     AUTO_PROPERTY(QString, dialogConnectErrorText)
+    AUTO_PROPERTY(QString, popupWarningText)
 
     READONLY_PROPERTY(QObject *, containersModel)
     READONLY_PROPERTY(QObject *, protocolsModel)
@@ -87,6 +89,7 @@ public:
     friend class ViewConfigLogic;
     friend class VpnLogic;
     friend class WizardLogic;
+    friend class AdvancedServerSettingsLogic;
 
     friend class PageProtocolLogicBase;
     friend class OpenVpnLogic;
@@ -112,11 +115,11 @@ public:
     Q_INVOKABLE void saveBinaryFile(const QString& desc, QString ext, const QString& data);
     Q_INVOKABLE void copyToClipboard(const QString& text);
 
+    Q_INVOKABLE amnezia::ErrorCode getInstalledContainers(bool addNewServerToGui);
+
     void shareTempFile(const QString &suggestedName, QString ext, const QString& data);
 
 signals:
-    void dialogConnectErrorTextChanged();
-
     void goToPage(PageEnumNS::Page page, bool reset = true, bool slide = true);
     void goToProtocolPage(Proto protocol, bool reset = true, bool slide = true);
     void goToShareProtocolPage(Proto protocol, bool reset = true, bool slide = true);
@@ -129,6 +132,7 @@ signals:
     void hide();
     void raise();
     void toggleLogPanel();
+    void showWarningMessage(QString message);
 
 private slots:
     // containers - INOUT arg
@@ -136,6 +140,7 @@ private slots:
 
 private:
     PageEnumNS::Page currentPage();
+    bool isContainerAlreadyAddedToGui(DockerContainer container, const ServerCredentials &selectedServerCredentials);
 
 public:
     Q_INVOKABLE PageProtocolLogicBase *protocolLogic(Proto p);
@@ -178,8 +183,8 @@ private:
 
     NotificationHandler* m_notificationHandler;
 
-    int selectedServerIndex = -1; // server index to use when proto settings page opened
+    int m_selectedServerIndex = -1; // server index to use when proto settings page opened
-    DockerContainer selectedDockerContainer; // same
+    DockerContainer m_selectedDockerContainer; // same
-    ServerCredentials installCredentials; // used to save cred between pages new_server and new_server_protocols and wizard
+    ServerCredentials m_installCredentials; // used to save cred between pages new_server and new_server_protocols and wizard
 };
 #endif // UILOGIC_H