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

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
commit 3034019d5a
10 changed files with 87 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Components/SettingsContainersListView.qml
View file

@ -38,8 +38,6 @@ ListView {
ButtonGroup.group: containersRadioButtonGroup
checked: isDefault
indicator: Rectangle {
anchors.fill: parent
color: containerRadioButton.hovered ? Qt.rgba(1, 1, 1, 0.08) : "transparent"

16
client/ui/qml/Controls2/BackButtonType.qml
View file

@ -34,22 +34,6 @@ Item {
Layout.fillWidth: true
color: "transparent"
ShaderEffectSource {
id: effectSource
sourceItem: background
anchors.fill: background
sourceRect: Qt.rect(x,y, width, height)
}
FastBlur {
id: blur
anchors.fill: effectSource
source: effectSource
radius: 100
}
}
}
}

30
client/ui/qml/Pages2/PageHome.qml
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()
}
}

4
client/ui/qml/Pages2/PageStart.qml
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 {