lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-03 14:25:38 +02:00
Code Activity

mainview: fix shortcuts to go to the settings page

Browse source 
Seems broken since a recent Qt upgrade. Calling a method in JamiQmlUtils
works as expected.

Change-Id: Ic1257a4f487560744f5ce1ea02928504ff572157
This commit is contained in:
Sébastien Blin 2024-01-25 10:07:22 -05:00
parent c6ff91bdb1
commit f40a8215d1
No known key found for this signature in database
GPG key ID: C894BB01EEB2A9A9
3 changed files with 64 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/constant/JamiQmlUtils.qml
View file

@ -49,6 +49,10 @@ Item {
signal settingsPageRequested(int index)
function requestSettingsPage(index) {
settingsPageRequested(index);
}
function updateMessageBarButtonsPoints() {
if (messageBarButtonsRowObj && audioRecordMessageButtonObj && videoRecordMessageButtonObj) {
audioRecordMessageButtonInMainViewPoint = messageBarButtonsRowObj.mapToItem(mainViewRectObj, audioRecordMessageButtonObj.x, audioRecordMessageButtonObj.y);

8
src/app/mainview/MainView.qml
View file

@ -64,7 +64,7 @@ Rectangle {
Shortcut {
sequence: "Ctrl+M"
context: Qt.ApplicationShortcut
onActivated: JamiQmlUtils.settingsPageRequested(12)
onActivated: JamiQmlUtils.requestSettingsPage(12)
}
WheelHandler {
@ -117,19 +117,19 @@ Rectangle {
Shortcut {
sequence: "Ctrl+G"
context: Qt.ApplicationShortcut
onActivated: JamiQmlUtils.settingsPageRequested(5)
onActivated: JamiQmlUtils.requestSettingsPage(5)
}
Shortcut {
sequence: "Ctrl+Alt+I"
context: Qt.ApplicationShortcut
onActivated: JamiQmlUtils.settingsPageRequested(0)
onActivated: JamiQmlUtils.requestSettingsPage(0)
}
Shortcut {
sequence: "Ctrl+P"
context: Qt.ApplicationShortcut
onActivated: JamiQmlUtils.settingsPageRequested(15)
onActivated: JamiQmlUtils.requestSettingsPage(15)
}
Shortcut {

56
tests/qml/src/tst_MainView.qml Normal file
View file

@ -0,0 +1,56 @@
/*
* Copyright (C) 2024 Savoir-faire Linux Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import QtQuick
import QtTest
import net.jami.Adapters 1.1
import net.jami.Models 1.1
import net.jami.Constants 1.1
import net.jami.Enums 1.1
import "../../../src/app/mainview"
import "../../../src/app/commoncomponents"
MainView {
id: uut
width: 400
height: 600
SignalSpy {
id: settingsPageRequestedSpy
target: JamiQmlUtils
signalName: "onSettingsPageRequested"
}
TestCase {
name: "Test shortcuts"
when: windowShown
function test_shortcuts() {
keyClick(Qt.Key_M, Qt.ControlModifier)
settingsPageRequestedSpy.wait(1000)
compare(settingsPageRequestedSpy.count, 1)
keyClick(Qt.Key_G, Qt.ControlModifier)
settingsPageRequestedSpy.wait(1000)
compare(settingsPageRequestedSpy.count, 2)
}
}
}