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

removed the display of servers without containers on PageShare (#609)

Browse source 
* removed the display of servers without containers on PageShare

* removed unused isAnyContainerInstalled() from containers model

* added tab navigation to the share connection drawer

* fixed display of default server without containers on PageShare
This commit is contained in:
Nethius 2024-02-29 17:22:17 +07:00 • committed by GitHub
parent e648054c7a
commit cd055cff62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 73 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Pages2/PageHome.qml
View file

@ -162,7 +162,7 @@ PageType {
}
}
expandedContent: Item {
expandedContent: Item {
id: serverMenuContainer
implicitHeight: root.height * 0.9

5
client/ui/qml/Pages2/PageSetupWizardEasy.qml
View file

@ -187,9 +187,8 @@ PageType {
visible: {
if (PageController.isTriggeredByConnectButton()) {
PageController.setTriggeredBtConnectButton(false)
return ContainersModel.isAnyContainerInstalled()
PageController.setTriggeredByConnectButton(false)
return false
}
return true

13
client/ui/qml/Pages2/PageShare.qml
View file

@ -308,6 +308,10 @@ PageType {
ValueFilter {
roleName: "hasWriteAccess"
value: true
},
ValueFilter {
roleName: "hasInstalledContainers"
value: true
}
]
}
@ -324,8 +328,12 @@ PageType {
}
Component.onCompleted: {
serverSelectorListView.currentIndex = ServersModel.isDefaultServerHasWriteAccess() ?
proxyServersModel.mapFromSource(ServersModel.defaultIndex) : 0
if (ServersModel.isDefaultServerHasWriteAccess() && ServersModel.getDefaultServerData("hasInstalledContainers")) {
serverSelectorListView.currentIndex = proxyServersModel.mapFromSource(ServersModel.defaultIndex)
} else {
serverSelectorListView.currentIndex = 0
}
serverSelectorListView.triggerCurrentItem()
}
@ -480,6 +488,7 @@ PageType {
Layout.fillWidth: true
Layout.topMargin: 40
Layout.bottomMargin: 32
enabled: shareButtonEnabled
visible: accessTypeSelector.currentIndex === 0

6
client/ui/qml/Pages2/PageStart.qml
View file

@ -60,8 +60,8 @@ PageType {
} else {
tabBarStackView.push(pagePath, { "objectName" : pagePath }, StackView.Immediate)
}
tabBar.isServerInfoShow = page === PageEnum.PageSettingsServerInfo || PageEnum.PageSettingsSplitTunneling || tabBar.isServerInfoShow
tabBar.isServerInfoShow = (page === PageEnum.PageSettingsServerInfo) || (page === PageEnum.PageSettingsSplitTunneling) || tabBar.isServerInfoShow
}
function onGoToStartPage() {
@ -122,7 +122,7 @@ PageType {
}
function onNoInstalledContainers() {
PageController.setTriggeredBtConnectButton(true)
PageController.setTriggeredByConnectButton(true)
ServersModel.processedIndex = ServersModel.getDefaultServerIndex()
InstallController.setShouldCreateServer(false)