From 78ec4510cd6f365bc297dbcc8b62976479d8b0af Mon Sep 17 00:00:00 2001 From: Cyril Anisimov Date: Fri, 25 Oct 2024 16:55:46 +0200 Subject: [PATCH] minor fixes --- client/ui/qml/Pages2/PageSettingsAbout.qml | 3 +++ client/ui/qml/Pages2/PageShareFullAccess.qml | 4 ++-- client/ui/qml/Pages2/PageStart.qml | 18 ++++++++++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml index 86034ae9c..8501d2a4f 100644 --- a/client/ui/qml/Pages2/PageSettingsAbout.qml +++ b/client/ui/qml/Pages2/PageSettingsAbout.qml @@ -83,6 +83,7 @@ PageType { ListView { id: listView + anchors.top: backButton.bottom anchors.bottom: parent.bottom anchors.right: parent.right @@ -218,6 +219,7 @@ PageType { BasicButtonType { id: checkUpdatesButton + Layout.alignment: Qt.AlignHCenter Layout.topMargin: 8 Layout.bottomMargin: 16 @@ -238,6 +240,7 @@ PageType { BasicButtonType { id: privacyPolicyButton + Layout.alignment: Qt.AlignHCenter Layout.bottomMargin: 16 Layout.topMargin: -15 diff --git a/client/ui/qml/Pages2/PageShareFullAccess.qml b/client/ui/qml/Pages2/PageShareFullAccess.qml index 5d0566e65..0863a73b2 100644 --- a/client/ui/qml/Pages2/PageShareFullAccess.qml +++ b/client/ui/qml/Pages2/PageShareFullAccess.qml @@ -104,7 +104,7 @@ PageType { shareConnectionDrawer.headerText = qsTr("Accessing ") + serverSelector.text shareConnectionDrawer.configContentHeaderText = qsTr("File with accessing settings to ") + serverSelector.text - serverSelector.close() + serverSelector.closeTriggered() } Component.onCompleted: { @@ -142,7 +142,7 @@ PageType { shareConnectionDrawer.headerText = qsTr("Connection to ") + serverSelector.text shareConnectionDrawer.configContentHeaderText = qsTr("File with connection settings to ") + serverSelector.text - shareConnectionDrawer.open() + shareConnectionDrawer.openTriggered() shareConnectionDrawer.contentVisible = true PageController.showBusyIndicator(false) diff --git a/client/ui/qml/Pages2/PageStart.qml b/client/ui/qml/Pages2/PageStart.qml index 14cc6896e..c08acb7bc 100644 --- a/client/ui/qml/Pages2/PageStart.qml +++ b/client/ui/qml/Pages2/PageStart.qml @@ -246,12 +246,22 @@ PageType { } Keys.onPressed: function(event) { - if(event.key === Qt.Key_Tab) { + console.debug(">>>> ", event.key, " Event is caught by StartPage") + switch (event.key) { + case Qt.Key_Tab: + case Qt.Key_Down: + case Qt.Key_Right: FocusController.nextKeyTabItem() + break + case Qt.Key_Backtab: + case Qt.Key_Up: + case Qt.Key_Left: + FocusController.previousKeyTabItem() + break + default: + PageController.keyPressEvent(event.key) + event.accepted = true } - - PageController.keyPressEvent(event.key) - event.accepted = true } }