Merge pull request #219 from amnezia-vpn/change/client-management-update-page

change/client-management-update-page

client/ui/qml/Pages/PageAdvancedServerSettings.qml

@@ -88,6 +88,15 @@ PageBase {
                 }
             }
 
+            BlueButtonType {
+                Layout.topMargin: 10
+                Layout.fillWidth: true
+                text: qsTr("Clients Management")
+                onClicked: {
+                    UiLogic.goToPage(PageEnum.ClientManagement)
+                }
+            }
+
             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?"

client/ui/qml/Pages/PageClientManagement.qml

@@ -62,8 +62,7 @@ PageBase {
                 implicitHeight: contentHeight + 20
                 anchors.left: parent.left
                 anchors.right: parent.right
-                anchors.leftMargin: 10
-                anchors.rightMargin: 10
+                anchors.rightMargin: 20
                 topMargin: 10
                 spacing: 10
                 clip: true

client/ui/qml/Pages/PageServerSettings.qml

@@ -90,23 +90,14 @@ PageBase {
                 Layout.fillWidth: true
                 Layout.topMargin: 10
                 text: qsTr("Advanced server settings")
-                visible: ServerSettingsLogic.pushButtonShareFullVisible //todo
                 onClicked: {
                     UiLogic.goToPage(PageEnum.AdvancedServerSettings)
                 }
             }
 
             BlueButtonType {
+                Layout.fillWidth: true
                 Layout.topMargin: 60
-                Layout.fillWidth: true
-                text: qsTr("Clients Management")
-                onClicked: {
-                    UiLogic.goToPage(PageEnum.ClientManagement)
-                }
-            }
-            BlueButtonType {
-                Layout.fillWidth: true
-                Layout.topMargin: 10
                 text: ServerSettingsLogic.pushButtonClearClientCacheText
                 visible: ServerSettingsLogic.pushButtonClearClientCacheVisible
                 onClicked: {

client/ui/uilogic.cpp

@@ -181,6 +181,9 @@ void UiLogic::showOnStartup()
 void UiLogic::onUpdateAllPages()
 {
     for (auto logic : m_logicMap) {
+        if (dynamic_cast<ClientInfoLogic*>(logic) || dynamic_cast<ClientManagementLogic*>(logic)) {
+            continue;
+        }
         logic->onUpdatePage();
     }
 }