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

minor fixes

Browse Source
This commit is contained in:
Cyril Anisimov
2024-10-25 16:55:46 +02:00
parent 3d7209ee7a
commit 163399816f
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/focusController.cpp
+4 -6
View File
@@ -153,8 +153,7 @@ void FocusController::focusNextListViewItem()
{
if (m_lvfc->isLastFocusItemInListView() || m_lvfc->isReturnNeeded()) {
qDebug() << "===>> [Last item in ListView was reached. Going to the NEXT element after ListView]";
delete m_lvfc;
m_lvfc = nullptr;
resetListView();
nextItem(Direction::Forward);
return;
} else if (m_lvfc->isLastFocusItemInDelegate()) {
@@ -171,8 +170,7 @@ void FocusController::focusPreviousListViewItem()
{
if (m_lvfc->isFirstFocusItemInListView() || m_lvfc->isReturnNeeded()) {
qDebug() << "===>> [First item in ListView was reached. Going to the PREVIOUS element after ListView]";
delete m_lvfc;
m_lvfc = nullptr;
resetListView();
nextItem(Direction::Backward);
return;
} else if (m_lvfc->isFirstFocusItemInDelegate()) {
@@ -279,7 +277,7 @@ void FocusController::pushRootObject(QObject* object)
void FocusController::dropRootObject(QObject* object)
{
if (m_rootObjects.empty()) {
qDebug() << "ROOT OBJECT is already NULL";
qDebug() << "ROOT OBJECT is already DEFAULT";
return;
}
@@ -289,7 +287,7 @@ void FocusController::dropRootObject(QObject* object)
if(m_rootObjects.size()) {
qDebug() << "===>> ROOT OBJECT is changed to: " << m_rootObjects.top();
} else {
qDebug() << "===>> ROOT OBJECT is changed to NULL";
qDebug() << "===>> ROOT OBJECT is changed to DEFAULT";
}
} else {
qWarning() << "===>> TRY TO DROP WRONG ROOT OBJECT: " << m_rootObjects.top() << " SHOULD BE: " << object;
client/ui/qml/Pages2/PageSettingsAbout.qml
+3
View File
@@ -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
client/ui/qml/Pages2/PageShareFullAccess.qml
+2 -2
View File
@@ -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)
client/ui/qml/Pages2/PageStart.qml
+14 -4
View File
@@ -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
}
}