Merge pull request #630 from amnezia-vpn/feature/api-containers-listview

for api servers, removed the ability to select a container
amnezia-vpn · Feb 21, 2024 · 3012559 · 3012559
2 parents 89d0a81 + b3ed57a
commit 3012559
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp
@@ -220,6 +220,11 @@ bool ServersModel::isDefaultServerCurrentlyProcessed()
     return m_defaultServerIndex == m_processedServerIndex;
 }
 
+bool ServersModel::isDefaultServerFromApi()
+{
+    return qvariant_cast<bool>(data(m_defaultServerIndex, IsServerFromApiRole));
+}
+
 bool ServersModel::isProcessedServerHasWriteAccess()
 {
     return qvariant_cast<bool>(data(m_processedServerIndex, HasWriteAccessRole));

diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h
@@ -49,7 +49,7 @@ class ServersModel : public QAbstractListModel
     Q_PROPERTY(QString defaultServerDescriptionCollapsed READ getDefaultServerDescriptionCollapsed NOTIFY defaultServerDefaultContainerChanged)
     Q_PROPERTY(QString defaultServerDescriptionExpanded READ getDefaultServerDescriptionExpanded NOTIFY defaultServerDefaultContainerChanged)
     Q_PROPERTY(bool isDefaultServerDefaultContainerHasSplitTunneling READ isDefaultServerDefaultContainerHasSplitTunneling NOTIFY defaultServerDefaultContainerChanged)
-
+    Q_PROPERTY(bool isDefaultServerFromApi READ isDefaultServerFromApi NOTIFY defaultServerIndexChanged)
 
     Q_PROPERTY(int processedIndex READ getProcessedServerIndex WRITE setProcessedServerIndex NOTIFY processedServerIndexChanged)
 
@@ -61,6 +61,7 @@ public slots:
     const QString getDefaultServerDescriptionExpanded();
     const QString getDefaultServerDefaultContainerName();
     bool isDefaultServerCurrentlyProcessed();
+    bool isDefaultServerFromApi();
 
     bool isProcessedServerHasWriteAccess();
     bool isDefaultServerHasWriteAccess();

diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml
@@ -193,7 +193,7 @@ PageType {
 
                 LabelTextType {
                     id: expandedServersMenuDescription
-                    Layout.bottomMargin: 24
+                    Layout.bottomMargin: ServersModel.isDefaultServerFromApi ? 69 : 24
                     Layout.fillWidth: true
                     horizontalAlignment: Qt.AlignHCenter
                     verticalAlignment: Qt.AlignVCenter
@@ -204,6 +204,9 @@ PageType {
                     Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
                     spacing: 8
 
+                    visible: !ServersModel.isDefaultServerFromApi
+                    onVisibleChanged: expandedServersMenuDescription.Layout
+
                     DropDownType {
                         id: containersDropDown