Compare commits

..

1 Commits

Author SHA1 Message Date
vladimir.kuznetsov 616849fafe bump xcode-version for macos build 2024-11-14 10:31:13 +07:00
4 changed files with 66 additions and 65 deletions
+1 -1
View File
@@ -256,7 +256,7 @@ jobs:
- name: 'Setup xcode'
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.3.1'
xcode-version: '15.4.0'
- name: 'Install Qt'
uses: jurplel/install-qt-action@v3
@@ -145,7 +145,6 @@ Button {
cursorShape: Qt.PointingHandCursor
hoverEnabled: true
enabled: root.enabled
onEntered: {
backgroundRect.color = root.hoveredColor
@@ -16,82 +16,83 @@ PageType {
defaultActiveFocusItem: focusItem
ColumnLayout {
id: header
FlickableType {
id: fl
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
spacing: 0
Item {
id: focusItem
KeyNavigation.tab: backButton
}
BackButtonType {
id: backButton
Layout.topMargin: 20
// KeyNavigation.tab: fileButton.rightButton
}
HeaderType {
Layout.fillWidth: true
Layout.topMargin: 8
Layout.rightMargin: 16
Layout.leftMargin: 16
Layout.bottomMargin: 16
headerText: qsTr("VPN by Amnezia")
descriptionText: qsTr("Choose a VPN service that suits your needs.")
}
}
ListView {
id: servicesListView
anchors.top: header.bottom
anchors.right: parent.right
anchors.left: parent.left
anchors.bottom: parent.bottom
anchors.topMargin: 16
spacing: 0
contentHeight: content.height
currentIndex: 1
clip: true
model: ApiServicesModel
ColumnLayout {
id: content
ScrollBar.vertical: ScrollBar {}
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
delegate: Item {
implicitWidth: servicesListView.width
implicitHeight: delegateContent.implicitHeight
spacing: 0
ColumnLayout {
id: delegateContent
Item {
id: focusItem
KeyNavigation.tab: backButton
}
anchors.fill: parent
BackButtonType {
id: backButton
Layout.topMargin: 20
// KeyNavigation.tab: fileButton.rightButton
}
CardWithIconsType {
id: card
HeaderType {
Layout.fillWidth: true
Layout.topMargin: 8
Layout.rightMargin: 16
Layout.leftMargin: 16
Layout.bottomMargin: 32
Layout.fillWidth: true
Layout.rightMargin: 16
Layout.leftMargin: 16
Layout.bottomMargin: 16
headerText: qsTr("VPN by Amnezia")
descriptionText: qsTr("Choose a VPN service that suits your needs.")
}
headerText: name
bodyText: cardDescription
footerText: price
ListView {
id: containers
width: parent.width
height: containers.contentItem.height
spacing: 16
rightImageSource: "qrc:/images/controls/chevron-right.svg"
currentIndex: 1
interactive: false
model: ApiServicesModel
enabled: isServiceAvailable
delegate: Item {
implicitWidth: containers.width
implicitHeight: delegateContent.implicitHeight
onClicked: {
if (isServiceAvailable) {
ApiServicesModel.setServiceIndex(index)
PageController.goToPage(PageEnum.PageSetupWizardApiServiceInfo)
ColumnLayout {
id: delegateContent
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
CardWithIconsType {
id: card
Layout.fillWidth: true
Layout.rightMargin: 16
Layout.leftMargin: 16
headerText: name
bodyText: cardDescription
footerText: price
rightImageSource: "qrc:/images/controls/chevron-right.svg"
onClicked: {
if (isServiceAvailable) {
ApiServicesModel.setServiceIndex(index)
PageController.goToPage(PageEnum.PageSetupWizardApiServiceInfo)
}
}
}
}
}
@@ -47,6 +47,7 @@ PageType {
KeyNavigation.tab: textKey.textField
}
HeaderType {
property bool isVisible: SettingsController.getInstallationUuid() !== "" || PageController.isStartPageVisible()