
- Added tab navigation functional. - In basic types added parentFlickable property, which will help to ensure, that the item is visible within flickable parent during tab navigation. - Added focus state for some basic types. - In PageType qml file added lastItemTabClicked function, which will help to focus tab bar buttons when the last tab on the current page clicked. - Added Focus for back button for all pages and drawers. - Added scroll on tab for Servers ListView on PageHome.
287 lines
8.8 KiB
QML
287 lines
8.8 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
|
|
import PageEnum 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Config"
|
|
import "../Controls2/TextTypes"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
defaultActiveFocusItem: focusItem
|
|
|
|
function getNextComponentInFocusChain(componentId) {
|
|
const componentsList = [focusItem,
|
|
backButton,
|
|
switcher,
|
|
switcherAutoStart,
|
|
switcherAutoConnect,
|
|
switcherStartMinimized,
|
|
labelWithButtonLanguage,
|
|
labelWithButtonLogging,
|
|
labelWithButtonReset,
|
|
]
|
|
|
|
const idx = componentsList.indexOf(componentId)
|
|
|
|
if (idx === -1) {
|
|
return null
|
|
}
|
|
|
|
let nextIndex = idx + 1
|
|
if (nextIndex >= componentsList.length) {
|
|
nextIndex = 0
|
|
}
|
|
|
|
if (componentsList[nextIndex].visible) {
|
|
if ((nextIndex) >= 6) {
|
|
return componentsList[nextIndex].rightButton
|
|
} else {
|
|
return componentsList[nextIndex]
|
|
}
|
|
} else {
|
|
return getNextComponentInFocusChain(componentsList[nextIndex])
|
|
}
|
|
}
|
|
|
|
Item {
|
|
id: focusItem
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(focusItem)
|
|
|
|
onFocusChanged: {
|
|
if (focusItem.activeFocus) {
|
|
fl.contentY = 0
|
|
}
|
|
}
|
|
}
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 20
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(backButton)
|
|
}
|
|
|
|
FlickableType {
|
|
id: fl
|
|
anchors.top: backButton.bottom
|
|
anchors.bottom: parent.bottom
|
|
contentHeight: content.height
|
|
|
|
ColumnLayout {
|
|
id: content
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
HeaderType {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("Application")
|
|
}
|
|
|
|
SwitcherType {
|
|
id: switcher
|
|
visible: GC.isMobile()
|
|
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
text: qsTr("Allow application screenshots")
|
|
|
|
checked: SettingsController.isScreenshotsEnabled()
|
|
onCheckedChanged: {
|
|
if (checked !== SettingsController.isScreenshotsEnabled()) {
|
|
SettingsController.toggleScreenshotsEnabled(checked)
|
|
}
|
|
}
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(switcher)
|
|
parentFlickable: fl
|
|
}
|
|
|
|
DividerType {
|
|
visible: GC.isMobile()
|
|
}
|
|
|
|
SwitcherType {
|
|
id: switcherAutoStart
|
|
visible: !GC.isMobile()
|
|
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
text: qsTr("Auto start")
|
|
descriptionText: qsTr("Launch the application every time the device is starts")
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(switcherAutoStart)
|
|
parentFlickable: fl
|
|
|
|
checked: SettingsController.isAutoStartEnabled()
|
|
onCheckedChanged: {
|
|
if (checked !== SettingsController.isAutoStartEnabled()) {
|
|
SettingsController.toggleAutoStart(checked)
|
|
}
|
|
}
|
|
}
|
|
|
|
DividerType {
|
|
visible: !GC.isMobile()
|
|
}
|
|
|
|
SwitcherType {
|
|
id: switcherAutoConnect
|
|
visible: !GC.isMobile()
|
|
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
text: qsTr("Auto connect")
|
|
descriptionText: qsTr("Connect to VPN on app start")
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(switcherAutoConnect)
|
|
parentFlickable: fl
|
|
|
|
checked: SettingsController.isAutoConnectEnabled()
|
|
onCheckedChanged: {
|
|
if (checked !== SettingsController.isAutoConnectEnabled()) {
|
|
SettingsController.toggleAutoConnect(checked)
|
|
}
|
|
}
|
|
}
|
|
|
|
DividerType {
|
|
visible: !GC.isMobile()
|
|
}
|
|
|
|
SwitcherType {
|
|
id: switcherStartMinimized
|
|
visible: !GC.isMobile()
|
|
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
text: qsTr("Start minimized")
|
|
descriptionText: qsTr("Launch application minimized")
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(switcherStartMinimized)
|
|
parentFlickable: fl
|
|
|
|
checked: SettingsController.isStartMinimizedEnabled()
|
|
onCheckedChanged: {
|
|
if (checked !== SettingsController.isStartMinimizedEnabled()) {
|
|
SettingsController.toggleStartMinimized(checked)
|
|
}
|
|
}
|
|
}
|
|
|
|
DividerType {
|
|
visible: !GC.isMobile()
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: labelWithButtonLanguage
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Language")
|
|
descriptionText: LanguageModel.currentLanguageName
|
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(labelWithButtonLanguage)
|
|
parentFlickable: fl
|
|
|
|
clickedFunction: function() {
|
|
selectLanguageDrawer.open()
|
|
}
|
|
}
|
|
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: labelWithButtonLogging
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Logging")
|
|
descriptionText: SettingsController.isLoggingEnabled ? qsTr("Enabled") : qsTr("Disabled")
|
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
|
|
|
KeyNavigation.tab: root.getNextComponentInFocusChain(labelWithButtonLogging)
|
|
parentFlickable: fl
|
|
|
|
clickedFunction: function() {
|
|
PageController.goToPage(PageEnum.PageSettingsLogging)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: labelWithButtonReset
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Reset settings and remove all data from the application")
|
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
|
textColor: "#EB5757"
|
|
|
|
Keys.onTabPressed: lastItemTabClicked()
|
|
parentFlickable: fl
|
|
|
|
clickedFunction: function() {
|
|
var headerText = qsTr("Reset settings and remove all data from the application?")
|
|
var descriptionText = qsTr("All settings will be reset to default. All installed AmneziaVPN services will still remain on the server.")
|
|
var yesButtonText = qsTr("Continue")
|
|
var noButtonText = qsTr("Cancel")
|
|
|
|
var yesButtonFunction = function() {
|
|
if (ServersModel.isDefaultServerCurrentlyProcessed() && ConnectionController.isConnected) {
|
|
PageController.showNotificationMessage(qsTr("Cannot reset settings during active connection"))
|
|
} else
|
|
{
|
|
SettingsController.clearSettings()
|
|
PageController.replaceStartPage()
|
|
}
|
|
|
|
if (!GC.isMobile()) {
|
|
root.defaultActiveFocusItem.forceActiveFocus()
|
|
}
|
|
}
|
|
var noButtonFunction = function() {
|
|
if (!GC.isMobile()) {
|
|
root.defaultActiveFocusItem.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
|
|
SelectLanguageDrawer {
|
|
id: selectLanguageDrawer
|
|
|
|
width: root.width
|
|
height: root.height
|
|
|
|
onClosed: {
|
|
if (!GC.isMobile()) {
|
|
focusItem.forceActiveFocus()
|
|
}
|
|
}
|
|
}
|
|
}
|