diff --git a/client/ui/models/servers_model.cpp b/client/ui/models/servers_model.cpp index 8294cc01..3c72ee49 100644 --- 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(data(m_defaultServerIndex, IsServerFromApiRole)); +} + bool ServersModel::isProcessedServerHasWriteAccess() { return qvariant_cast(data(m_processedServerIndex, HasWriteAccessRole)); diff --git a/client/ui/models/servers_model.h b/client/ui/models/servers_model.h index b694b6f6..3e24e46c 100644 --- a/client/ui/models/servers_model.h +++ b/client/ui/models/servers_model.h @@ -49,7 +49,7 @@ public: 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 index 04f59627..536fc951 100644 --- 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