andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

Browse Source
This commit is contained in:
vladimir.kuznetsov
2023-06-07 18:28:44 +08:00
parent 1fd48a1cf8 c3f39ad24d
commit 3034019d5a
10 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/qml/Pages2/PageHome.qml
+14 -16
View File
@@ -137,21 +137,6 @@ PageType {
Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
spacing: 8
SortFilterProxyModel {
id: proxyContainersModel
sourceModel: ContainersModel
filters: [
ValueFilter {
roleName: "serviceType"
value: ProtocolEnum.Vpn
},
ValueFilter {
roleName: "isSupported"
value: true
}
]
}
DropDownType {
id: containersDropDown
@@ -176,7 +161,20 @@ PageType {
listView: HomeContainersListView {
rootWidth: root.width
model: proxyContainersModel
model: SortFilterProxyModel {
id: proxyContainersModel
sourceModel: ContainersModel
filters: [
ValueFilter {
roleName: "serviceType"
value: ProtocolEnum.Vpn
},
ValueFilter {
roleName: "isSupported"
value: true
}
]
}
currentIndex: ContainersModel.getDefaultContainer()
}
}
client/ui/qml/Pages2/PageStart.qml
+2 -2
View File
@@ -45,9 +45,9 @@ PageType {
Component.onCompleted: {
var pagePath = PageController.getPagePath(PageEnum.PageHome)
tabBarStackView.push(pagePath, { "objectName" : pagePath })
ServersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
tabBarStackView.push(pagePath, { "objectName" : pagePath })
}
}
@@ -71,8 +71,8 @@ PageType {
isSelected: tabBar.currentIndex === 0
image: "qrc:/images/controls/home.svg"
onClicked: {
tabBarStackView.goToTabBarPage(PageEnum.PageHome)
ContainersModel.setCurrentlyProcessedServerIndex(ServersModel.getDefaultServerIndex())
tabBarStackView.goToTabBarPage(PageEnum.PageHome)
}
}
TabImageButtonType {